Changeset a4ac9c4 for protocols/jabber/iq.c

Timestamp:

2023-04-01T20:09:39Z (18 months ago)

Author:

GitHub <noreply@…>

Branches:

master

Children:

552da22

Parents:

59c9fa4d

git-author:

Jelmer Vernooij <jelmer@…> (01-04-23 20:09:39)

git-committer:

GitHub <noreply@…> (01-04-23 20:09:39)

Message:

Deprecate sha1_* functions (#172)

• Migrate sha1 calls to direct use of GChecksum

• Mark sha1.h functions as deprecated

File:

• protocols/jabber/iq.c (modified) (2 diffs)

protocols/jabber/iq.c

@@ -23 +23 @@
 
 #include "jabber.h"
-#include "sha1.h"
 
 static xt_status jabber_parse_roster(struct im_connection *ic, struct xt_node *node, struct xt_node *orig);
@@ -245 +244 @@
                 /* We can do digest authentication, it seems, and of
                    course we prefer that. */
-                sha1_state_t sha;
+                GChecksum *sha;
                 char hash_hex[41];
                 unsigned char hash[20];
                 int i;
-
-                sha1_init(&sha);
-                sha1_append(&sha, (unsigned char *) s, strlen(s));
-                sha1_append(&sha, (unsigned char *) ic->acc->pass, strlen(ic->acc->pass));
-                sha1_finish(&sha, hash);
+                gsize digest_len = 20;
+
+                sha = g_checksum_new(G_CHECKSUM_SHA1);
+                g_checksum_update(sha, (unsigned char *) s, strlen(s));
+                g_checksum_update(sha, (unsigned char *) ic->acc->pass, strlen(ic->acc->pass));
+                g_checksum_get_digest(sha, hash, &digest_len);
+                g_checksum_free(sha);
 
                 for (i = 0; i < 20; i++) {