Changeset 8b6b740

Timestamp:

2010-03-11T11:15:36Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

547c94c, be609ff

Parents:

75ec2c8

Message:

Document the new -x flag in one useful location and make it a bit better at
argument checking to avoid ugly (even though harmless) segfaults. Also skip
any md5: prefix that may be present when checking hashes.

Files:

• bitlbee.conf (modified) (1 diff)
• unix.c (modified) (2 diffs)

bitlbee.conf

@@ -55 +55 @@
 ##
 ## Password the user should enter when logging into a closed BitlBee server.
-## You can also have an MD5-encrypted password here. Format: "md5:", followed
-## by a hash as generated for the <user password=""> attribute in a BitlBee
-## XML file (for now there's no easier way to generate the hash).
+## You can also have a BitlBee-style MD5 hash here. Format: "md5:", followed
+## by a hash as generated by "bitlbee -x hash <password>".
 ##
 # AuthPassword = ItllBeBitlBee   ## Heh.. Our slogan. ;-)

unix.c

@@ -173 +173 @@
         unsigned char *pass_cr, *pass_cl;
         
-        if( argc < 3 )
+        if( argc < 4 || ( strcmp( argv[2], "hash" ) != 0 &&
+                          strcmp( argv[2], "unhash" ) != 0 && argc < 5 ) )
         {
                 printf( "Supported:\n"
@@ -214 +215 @@
         else if( strcmp( argv[2], "chkhash" ) == 0 )
         {
-                int st = md5_verify_password( argv[4], argv[3] );
+                char *hash = strncmp( argv[3], "md5:", 4 ) == 0 ? argv[3] + 4 : argv[3];
+                int st = md5_verify_password( argv[4], hash );
                 
                 printf( "Hash %s given password.\n", st == 0 ? "matches" : "does not match" );