Changeset 1bdc669 for protocols/jabber/jabber.c

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

File:

• protocols/jabber/jabber.c (modified) (3 diffs)

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