Changeset 1bdc669

Timestamp:

2023-02-23T23:48:10Z (22 months ago)

Author:

GitHub <noreply@…>

Branches:

master

Children:

93d4d8f

Parents:

7342cae

git-author:

Jelmer Vernooij <jelmer@…> (23-02-23 23:48:10)

git-committer:

GitHub <noreply@…> (23-02-23 23:48:10)

Message:

Migrate internal users of md5.h to using GChecksum directly (#169)

• Use GChecksum directly rather than md5 wrapper

• Mark md5 functions as deprecated.

• Migrate more users of md5.h to GChecksum

Files:

• lib/md5.c (modified) (1 diff)
• lib/md5.h (modified) (1 diff)
• lib/misc.c (modified) (3 diffs)
• protocols/jabber/jabber.c (modified) (3 diffs)
• protocols/jabber/jabber.h (modified) (2 diffs)
• protocols/jabber/jabber_util.c (modified) (3 diffs)
• protocols/jabber/sasl.c (modified) (4 diffs)
• storage_xml.c (modified) (3 diffs)
• unix.c (modified) (1 diff)

lib/md5.c

@@ -28 +28 @@
 void md5_digest_keep(md5_state_t *ctx, guint8 digest[MD5_HASH_SIZE])
 {
-        md5_state_t copy = g_checksum_copy(*ctx);
+        gsize digest_len = MD5_HASH_SIZE;
+        GChecksum *copy = g_checksum_copy(*ctx);
 
-        md5_finish(&copy, digest);
+        g_checksum_get_digest(copy, digest, &digest_len);
+        g_checksum_free(copy);
 }
 

lib/md5.h

@@ -8 +8 @@
 typedef GChecksum *md5_state_t;
 
-
 #define MD5_HASH_SIZE 16
 
-void md5_init(md5_state_t *);
-void md5_append(md5_state_t *, const guint8 *, unsigned int);
-void md5_finish(md5_state_t *, guint8 digest[MD5_HASH_SIZE]);
-void md5_digest_keep(md5_state_t *, guint8 digest[MD5_HASH_SIZE]);
-void md5_free(md5_state_t *);
+#ifdef __GNUC__
+#define __MD5_NON_PUBLIC_DEPRECATION__ __attribute__((deprecated("md5.h will be removed from Bitlbee's public API. Please use another library (such as GLib's gchecksum) instead")))
+#else
+#define __MD5_NON_PUBLIC_DEPRECATION__
+#endif
+
+void md5_init(md5_state_t *) __MD5_NON_PUBLIC_DEPRECATION__;
+void md5_append(md5_state_t *, const guint8 *, unsigned int) __MD5_NON_PUBLIC_DEPRECATION__;
+void md5_finish(md5_state_t *, guint8 digest[MD5_HASH_SIZE]) __MD5_NON_PUBLIC_DEPRECATION__;
+void md5_digest_keep(md5_state_t *, guint8 digest[MD5_HASH_SIZE]) __MD5_NON_PUBLIC_DEPRECATION__;
+void md5_free(md5_state_t *) __MD5_NON_PUBLIC_DEPRECATION__;
 
 #endif

lib/misc.c

@@ -34 +34 @@
 #include "nogaim.h"
 #include "base64.h"
-#include "md5.h"
 #include <stdio.h>
 #include <stdlib.h>
@@ -47 +46 @@
 #endif
 
-#include "md5.h"
 #include "ssl_client.h"
 
@@ -576 +574 @@
 int md5_verify_password(char *password, char *hash)
 {
-        md5_byte_t *pass_dec = NULL;
-        md5_byte_t pass_md5[16];
-        md5_state_t md5_state;
+        guint8 *pass_dec = NULL;
+        guint8 pass_md5[16];
+        GChecksum *md5_state;
+        gsize digest_len = MD5_HASH_SIZE;
         int ret = -1, i;
 
         if (base64_decode(hash, &pass_dec) == 21) {
-                md5_init(&md5_state);
-                md5_append(&md5_state, (md5_byte_t *) password, strlen(password));
-                md5_append(&md5_state, (md5_byte_t *) pass_dec + 16, 5);  /* Hmmm, salt! */
-                md5_finish(&md5_state, pass_md5);
+                md5_state = g_checksum_new(G_CHECKSUM_MD5);
+                g_checksum_update(md5_state, (guint8 *) password, strlen(password));
+                g_checksum_update(md5_state, (guint8 *) pass_dec + 16, 5);  /* Hmmm, salt! */
+                g_checksum_get_digest(md5_state, pass_md5, &digest_len);
+                g_checksum_free(md5_state);
 
                 for (i = 0; i < 16; i++) {

protocols/jabber/jabber.c

@@ -33 +33 @@
 #include "jabber.h"
 #include "oauth.h"
-#include "md5.h"
 
 GSList *jabber_connections;
@@ -301 +300 @@
 }
 
-/* This generates an unfinished md5_state_t variable. Every time we generate
+/* This generates an unfinished g_checksum variable. Every time we generate
    an ID, we finish the state by adding a sequence number and take the hash. */
 static void jabber_generate_id_hash(struct jabber_data *jd)
 {
-        md5_byte_t binbuf[4];
+        guint8 binbuf[4];
         char *s;
 
-        md5_init(&jd->cached_id_prefix);
-        md5_append(&jd->cached_id_prefix, (unsigned char *) jd->username, strlen(jd->username));
-        md5_append(&jd->cached_id_prefix, (unsigned char *) jd->server, strlen(jd->server));
+        jd->cached_id_prefix = g_checksum_new(G_CHECKSUM_MD5);
+        g_checksum_update(jd->cached_id_prefix, jd->username, strlen(jd->username));
+        g_checksum_update(jd->cached_id_prefix, jd->server, strlen(jd->server));
         s = set_getstr(&jd->ic->acc->set, "resource");
-        md5_append(&jd->cached_id_prefix, (unsigned char *) s, strlen(s));
+        g_checksum_update(jd->cached_id_prefix, s, strlen(s));
         random_bytes(binbuf, 4);
-        md5_append(&jd->cached_id_prefix, binbuf, 4);
+        g_checksum_update(jd->cached_id_prefix, binbuf, 4);
 }
 
@@ -371 +370 @@
         xt_free(jd->xt);
 
-        md5_free(&jd->cached_id_prefix);
+        g_checksum_free(jd->cached_id_prefix);
 
         g_free(jd->oauth2_access_token);

protocols/jabber/jabber.h

@@ -28 +28 @@
 
 #include "bitlbee.h"
-#include "md5.h"
 #include "xmltree.h"
 
@@ -105 +104 @@
         char *gmail_tid;
 
-        md5_state_t cached_id_prefix;
+        GChecksum *cached_id_prefix;
         GHashTable *node_cache;
         GHashTable *buddies;

protocols/jabber/jabber_util.c

@@ -23 +23 @@
 
 #include "jabber.h"
-#include "md5.h"
 #include "base64.h"
 
@@ -141 +140 @@
         struct jabber_data *jd = ic->proto_data;
         struct jabber_cache_entry *entry = g_new0(struct jabber_cache_entry, 1);
-        md5_state_t id_hash;
-        md5_byte_t id_sum[16];
+        GChecksum *id_hash;
+        gsize digest_len = MD5_HASH_SIZE;
+        guint8 id_sum[MD5_HASH_SIZE];
         char *id, *asc_hash;
 
@@ -148 +148 @@
 
         id_hash = jd->cached_id_prefix;
-        md5_append(&id_hash, (md5_byte_t *) &next_id, sizeof(next_id));
-        md5_digest_keep(&id_hash, id_sum);
+        g_checksum_update(id_hash, (guint8 *) &next_id, sizeof(next_id));
+        g_checksum_get_digest(id_hash, id_sum, &digest_len);
+        g_checksum_free(id_hash);
+
         asc_hash = base64_encode(id_sum, 12);
 

protocols/jabber/sasl.c

@@ -302 +302 @@
         if (!(s = sasl_get_part(dec, "rspauth"))) {
                 /* See RFC 2831 for for information. */
-                md5_state_t A1, A2, H;
-                md5_byte_t A1r[16], A2r[16], Hr[16];
+                GChecksum *A1, *A2, *H;
+                gsize digest_len = MD5_HASH_SIZE;
+                guint8 A1r[16], A2r[16], Hr[16];
                 char A1h[33], A2h[33], Hh[33];
                 int i;
@@ -327 +328 @@
                 /* Generate the MD5 hash of username:realm:password,
                    I decided to call it H. */
-                md5_init(&H);
+                H = g_checksum_new(G_CHECKSUM_MD5);
                 s = g_strdup_printf("%s:%s:%s", jd->username, realm, ic->acc->pass);
-                md5_append(&H, (unsigned char *) s, strlen(s));
+                g_checksum_update(H, (guint8 *)s, strlen(s));
                 g_free(s);
-                md5_finish(&H, Hr);
+
+                g_checksum_get_digest(H, Hr, &digest_len);
+                g_checksum_free(H);
 
                 /* Now generate the hex. MD5 hash of H:nonce:cnonce, called A1. */
-                md5_init(&A1);
+                A1 = g_checksum_new(G_CHECKSUM_MD5);
                 s = g_strdup_printf(":%s:%s", nonce, cnonce);
-                md5_append(&A1, Hr, 16);
-                md5_append(&A1, (unsigned char *) s, strlen(s));
+                g_checksum_update(A1, Hr, 16);
+                g_checksum_update(A1, (guint8 *)s, strlen(s));
                 g_free(s);
-                md5_finish(&A1, A1r);
+                g_checksum_get_digest(A1, A1r, &digest_len);
+                g_checksum_free(A1);
                 for (i = 0; i < 16; i++) {
                         sprintf(A1h + i * 2, "%02x", A1r[i]);
@@ -345 +349 @@
 
                 /* A2... */
-                md5_init(&A2);
+                A2 = g_checksum_new(G_CHECKSUM_MD5);
                 s = g_strdup_printf("%s:%s", "AUTHENTICATE", digest_uri);
-                md5_append(&A2, (unsigned char *) s, strlen(s));
+                g_checksum_update(A2, (guint8 *)s, strlen(s));
                 g_free(s);
-                md5_finish(&A2, A2r);
+                g_checksum_get_digest(A2, A2r, &digest_len);
+                g_checksum_free(A2);
                 for (i = 0; i < 16; i++) {
                         sprintf(A2h + i * 2, "%02x", A2r[i]);
@@ -355 +360 @@
 
                 /* Final result: A1:nonce:00000001:cnonce:auth:A2. Let's reuse H for it. */
-                md5_init(&H);
+                H = g_checksum_new(G_CHECKSUM_MD5);
                 s = g_strdup_printf("%s:%s:%s:%s:%s:%s", A1h, nonce, "00000001", cnonce, "auth", A2h);
-                md5_append(&H, (unsigned char *) s, strlen(s));
+                g_checksum_update(H, (guint8 *)s, strlen(s));
                 g_free(s);
-                md5_finish(&H, Hr);
+                g_checksum_get_digest(H, Hr, &digest_len);
+                g_checksum_free(H);
+
                 for (i = 0; i < 16; i++) {
                         sprintf(Hh + i * 2, "%02x", Hr[i]);

storage_xml.c

@@ -28 +28 @@
 #include "base64.h"
 #include "arc.h"
-#include "md5.h"
 #include "xmltree.h"
 
@@ -323 +322 @@
         char *pass_buf = NULL;
         account_t *acc;
-        md5_byte_t pass_md5[21];
-        md5_state_t md5_state;
+        guint8 pass_md5[21];
+        GChecksum *md5_state;
         GSList *l;
         struct xt_node *root, *cur;
+        gsize digest_len = MD5_HASH_SIZE;
 
         root = cur = xt_new_node("user", NULL, NULL);
@@ -336 +336 @@
                    byte password hash, more convenient for base64 encoding. */
                 random_bytes(pass_md5 + 16, 5);
-                md5_init(&md5_state);
-                md5_append(&md5_state, (md5_byte_t *) irc->password, strlen(irc->password));
-                md5_append(&md5_state, pass_md5 + 16, 5);   /* Add the salt. */
-                md5_finish(&md5_state, pass_md5);
+                md5_state = g_checksum_new(G_CHECKSUM_MD5);
+                g_checksum_update(md5_state, (guint8 *) irc->password, strlen(irc->password));
+                g_checksum_update(md5_state, pass_md5 + 16, 5);   /* Add the salt. */
+                g_checksum_get_digest(md5_state, pass_md5, &digest_len);
+                g_checksum_free(md5_state);
                 /* Save the hash in base64-encoded form. */
                 pass_buf = base64_encode(pass_md5, 21);

unix.c

@@ -261 +261 @@
                 g_free(pass_cl);
         } else if (strcmp(argv[2], "hash") == 0) {
-                md5_byte_t pass_md5[21];
-                md5_state_t md5_state;
+                guint8 pass_md5[21];
+                GChecksum *md5_state;
+                gsize digest_len = MD5_HASH_SIZE;
                 char *encoded;
 
                 random_bytes(pass_md5 + 16, 5);
-                md5_init(&md5_state);
-                md5_append(&md5_state, (md5_byte_t *) argv[3], strlen(argv[3]));
-                md5_append(&md5_state, pass_md5 + 16, 5);   /* Add the salt. */
-                md5_finish(&md5_state, pass_md5);
+                md5_state = g_checksum_new(G_CHECKSUM_MD5);
+                g_checksum_update(md5_state, (guint8 *) argv[3], strlen(argv[3]));
+                g_checksum_update(md5_state, pass_md5 + 16, 5);   /* Add the salt. */
+                g_checksum_get_digest(md5_state, pass_md5, &digest_len);
+                g_checksum_free(md5_state);
 
                 encoded = base64_encode(pass_md5, 21);