Changeset 89d736a for protocols/jabber/jabber.c

Timestamp:

2008-06-22T19:21:06Z (16 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

dfbb056

Parents:

fab3d2d

Message:

From the department of over-engineering, now cached packet IDs are full
MD5 hashes instead of a known MD5 hash with a number. Just to make it
harder to confuse BitlBee by sending it faked responses to packets.

File:

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

protocols/jabber/jabber.c

@@ -33 +33 @@
 #include "jabber.h"
 #include "md5.h"
-#include "base64.h"
 
 GSList *jabber_connections;
@@ -241 +240 @@
 }
 
+/* This generates an unfinished md5_state_t 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_state_t id_hash;
-        md5_byte_t binbuf[16];
+        md5_byte_t binbuf[4];
         char *s;
         
-        md5_init( &id_hash );
-        md5_append( &id_hash, (unsigned char *) jd->username, strlen( jd->username ) );
-        md5_append( &id_hash, (unsigned char *) jd->server, strlen( jd->server ) );
+        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 ) );
         s = set_getstr( &jd->ic->acc->set, "resource" );
-        md5_append( &id_hash, (unsigned char *) s, strlen( s ) );
-        random_bytes( binbuf, 16 );
-        md5_append( &id_hash, binbuf, 16 );
-        md5_finish( &id_hash, binbuf );
-        
-        s = base64_encode( binbuf, 9 );
-        jd->cached_id_prefix = g_strdup_printf( "%s%s", JABBER_CACHED_ID, s );
-        g_free( s );
+        md5_append( &jd->cached_id_prefix, (unsigned char *) s, strlen( s ) );
+        random_bytes( binbuf, 4 );
+        md5_append( &jd->cached_id_prefix, binbuf, 4 );
 }
 
@@ -289 +284 @@
         xt_free( jd->xt );
         
-        g_free( jd->cached_id_prefix );
         g_free( jd->away_message );
         g_free( jd->username );