Changeset 1bdc669 for protocols/jabber/sasl.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:

• protocols/jabber/sasl.c (modified) (4 diffs)

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