Changeset b79308b for lib/misc.c

Timestamp:

2008-04-14T13:10:53Z (16 years ago)

Author:

ulim <a.sporto+bee@…>

Branches:

master

Children:

0cab388

Parents:

6cac643 (diff), aa31117 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merged in upstream r379 (somewhere after 1.2-3).
Just one trivial conflict in the jabber Makefile, went smoothly.

File:

• lib/misc.c (modified) (2 diffs)

lib/misc.c

@@ -33 +33 @@
 #define BITLBEE_CORE
 #include "nogaim.h"
+#include "base64.h"
 #include <stdio.h>
 #include <stdlib.h>
@@ -597 +598 @@
                 return sockerr_again();
 }
+
+/* Returns values: -1 == Failure (base64-decoded to something unexpected)
+                    0 == Okay
+                    1 == Password doesn't match the hash. */
+int md5_verify_password( char *password, char *hash )
+{
+        md5_byte_t *pass_dec = NULL;
+        md5_byte_t pass_md5[16];
+        md5_state_t md5_state;
+        int ret, i;
+        
+        if( base64_decode( hash, &pass_dec ) != 21 )
+        {
+                ret = -1;
+        }
+        else
+        {
+                md5_init( &md5_state );
+                md5_append( &md5_state, (md5_byte_t*) password, strlen( password ) );
+                md5_append( &md5_state, (md5_byte_t*) pass_dec + 16, 5 ); /* Hmmm, salt! */
+                md5_finish( &md5_state, pass_md5 );
+                
+                for( i = 0; i < 16; i ++ )
+                {
+                        if( pass_dec[i] != pass_md5[i] )
+                        {
+                                ret = 1;
+                                break;
+                        }
+                }
+                
+                /* If we reached the end of the loop, it was a match! */
+                if( i == 16 )
+                        ret = 0;
+        }
+        
+        g_free( pass_dec );
+
+        return ret;
+}