Changeset 4e8db1c

Timestamp:

2008-03-16T16:03:52Z (17 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

ec0355f

Parents:

50d26f3

Message:

Moved password hash verification to md5_verify_password() so this can be
reused for IRC/OPER passwords (to have encrypted in bitlbee.conf).

Files:

• lib/misc.c (modified) (2 diffs)
• lib/misc.h (modified) (1 diff)
• storage_xml.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;
+}

lib/misc.h

@@ -67 +67 @@
 G_MODULE_EXPORT gboolean ssl_sockerr_again( void *ssl );
 
+G_MODULE_EXPORT int md5_verify_password( char *password, char *hash );
+
 #endif

storage_xml.c

@@ -80 +80 @@
                 char *nick = xml_attr( attr_names, attr_values, "nick" );
                 char *pass = xml_attr( attr_names, attr_values, "password" );
-                md5_byte_t *pass_dec = NULL;
+                int st;
                 
                 if( !nick || !pass )
@@ -87 +87 @@
                                      "Missing attributes for %s element", element_name );
                 }
-                else if( base64_decode( pass, &pass_dec ) != 21 )
-                {
+                else if( ( st = md5_verify_password( xd->given_pass, pass ) ) == -1 )
+                {
+                        xd->pass_st = XML_PASS_WRONG;
                         g_set_error( error, G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT,
                                      "Error while decoding password attribute" );
                 }
+                else if( st == 0 )
+                {
+                        if( xd->pass_st != XML_PASS_CHECK_ONLY )
+                                xd->pass_st = XML_PASS_OK;
+                }
                 else
                 {
-                        md5_byte_t pass_md5[16];
-                        md5_state_t md5_state;
-                        int i;
-                        
-                        md5_init( &md5_state );
-                        md5_append( &md5_state, (md5_byte_t*) xd->given_pass, strlen( xd->given_pass ) );
-                        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] )
-                                {
-                                        xd->pass_st = XML_PASS_WRONG;
-                                        g_set_error( error, G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT,
-                                                     "Password mismatch" );
-                                        break;
-                                }
-                        }
-                        
-                        /* If we reached the end of the loop, it was a match! */
-                        if( i == 16 )
-                        {
-                                if( xd->pass_st != XML_PASS_CHECK_ONLY )
-                                        xd->pass_st = XML_PASS_OK;
-                        }
-                }
-                
-                g_free( pass_dec );
+                        xd->pass_st = XML_PASS_WRONG;
+                        g_set_error( error, G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT,
+                                     "Password mismatch" );
+                }
         }
         else if( xd->pass_st < XML_PASS_OK )