Changeset 7c9db24 for unix.c

Timestamp:

2010-03-08T02:10:41Z (13 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

3e1ef92c

Parents:

b52e478

Message:

Replaced obsolete (useless for the current .xml files) encode/decode tools
with a few command-line options to the BitlBee binary. Type "bitlbee -x"
for more info.

File:

• unix.c (modified) (5 diffs)

unix.c

@@ -25 +25 @@
 
 #include "bitlbee.h"
+
+#include "arc.h"
+#include "base64.h"
 #include "commands.h"
-#include "crypting.h"
 #include "protocols/nogaim.h"
 #include "help.h"
 #include "ipc.h"
+#include "md5.h"
+#include "misc.h"
 #include <signal.h>
 #include <unistd.h>
@@ -40 +44 @@
 static void sighandler( int signal );
 
+static int crypt_main( int argc, char *argv[] );
+
 int main( int argc, char *argv[] )
 {
@@ -45 +51 @@
         char *old_cwd = NULL;
         struct sigaction sig, old;
+        
+        if( argc > 1 && strcmp( argv[1], "-x" ) == 0 )
+                return crypt_main( argc, argv );
         
         log_init();
@@ -159 +168 @@
 }
 
+static int crypt_main( int argc, char *argv[] )
+{
+        int pass_len;
+        unsigned char *pass_cr, *pass_cl;
+        
+        if( argc < 3 )
+        {
+                printf( "Supported:\n"
+                        "  %s -x enc <key> <cleartext password>\n"
+                        "  %s -x dec <key> <encrypted password>\n"
+                        "  %s -x hash <cleartext password>\n"
+                        "  %s -x unhash <hashed password>\n"
+                        "  %s -x chkhash <hashed password> <cleartext password>\n",
+                        argv[0], argv[0], argv[0], argv[0], argv[0] );
+        }
+        else if( strcmp( argv[2], "enc" ) == 0 )
+        {
+                pass_len = arc_encode( argv[4], strlen( argv[4] ), (unsigned char**) &pass_cr, argv[3], 12 );
+                printf( "%s\n", base64_encode( pass_cr, pass_len ) );
+        }
+        else if( strcmp( argv[2], "dec" ) == 0 )
+        {
+                pass_len = base64_decode( argv[4], (unsigned char**) &pass_cr );
+                arc_decode( pass_cr, pass_len, (char**) &pass_cl, argv[3] );
+                printf( "%s\n", pass_cl );
+        }
+        else if( strcmp( argv[2], "hash" ) == 0 )
+        {
+                md5_byte_t pass_md5[21];
+                md5_state_t md5_state;
+                
+                random_bytes( pass_md5 + 16, 5 );
+                md5_init( &md5_state );
+                md5_append( &md5_state, (md5_byte_t*) argv[3], strlen( argv[3] ) );
+                md5_append( &md5_state, pass_md5 + 16, 5 ); /* Add the salt. */
+                md5_finish( &md5_state, pass_md5 );
+                
+                printf( "%s\n", base64_encode( pass_md5, 21 ) );
+        }
+        else if( strcmp( argv[2], "unhash" ) == 0 )
+        {
+                printf( "Hash %s submitted to a massive Beowulf cluster of\n"
+                        "overclocked 486s. Expect your answer next year somewhere around this time. :-)\n", argv[3] );
+        }
+        else if( strcmp( argv[2], "chkhash" ) == 0 )
+        {
+                int st = md5_verify_password( argv[4], argv[3] );
+                
+                printf( "Hash %s given password.\n", st == 0 ? "matches" : "does not match" );
+                
+                return st;
+        }
+        
+        return 0;
+}
+
 static void sighandler( int signal )
 {
@@ -214 +279 @@
         return( (double) time->tv_sec + (double) time->tv_usec / 1000000 );
 }
-
-