Changeset 34afea7 for protocols/jabber

Timestamp:

2015-01-31T23:58:57Z (10 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

0ca1d79

Parents:

e41cc40

git-author:

dequis <dx@…> (18-01-15 06:39:20)

git-committer:

dequis <dx@…> (31-01-15 23:58:57)

Message:

Use glib's GChecksum for md5/sha1

This changes behavior slightly:

• md5_init()/sha1_init() allocate a GChecksum
• md5_finish()/sha1_finish() close and free() it
• md5_digest_keep() was added (no sha1 equivalent needed)

And yes, glib has this concept of "closing" the GChecksum, which means
it can't be used anymore after g_checksum_get_digest().

jabber_cache_add() actually seems to need to do that to generate some
random-ish values, so i kept that working by adding a md5_digest_keep()
function that copies the GChecksum before it gets closed

GChecksum was introduced in glib 2.16, so the configure script version
was bumped. We were already depending on glib 2.16 accidentally
(some post-3.2.2 code uses GHashTableIter)

Location:

protocols/jabber

Files:

• jabber.c (modified) (1 diff)
• jabber_util.c (modified) (1 diff)

protocols/jabber/jabber.c

@@ -317 +317 @@
         
         xt_free( jd->xt );
+
+        md5_free( &jd->cached_id_prefix );
         
         g_free( jd->oauth2_access_token );

protocols/jabber/jabber_util.c

@@ -148 +148 @@
         id_hash = jd->cached_id_prefix;
         md5_append( &id_hash, (md5_byte_t*) &next_id, sizeof( next_id ) );
-        md5_finish( &id_hash, id_sum );
+        md5_digest_keep( &id_hash, id_sum );
         asc_hash = base64_encode( id_sum, 12 );