Changeset 1bdc669 for lib/misc.c

Timestamp:

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

File:

• lib/misc.c (modified) (3 diffs)

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