Changeset 1bdc669 for lib

Timestamp:

2023-02-23T23:48:10Z (21 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

Location:

lib

Files:

• md5.c (modified) (1 diff)
• md5.h (modified) (1 diff)
• misc.c (modified) (3 diffs)

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++) {