Changeset 1bdc669 for storage_xml.c

Timestamp:

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

File:

• storage_xml.c (modified) (3 diffs)

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);