Ticket #456: encode_decode.patch

bitlbee-1.2.3

@@ -137 +137 @@
 /* A little main() function for people who want a stand-alone program to
    encode/decode BitlCrypted files. */
 
-int main( int argc, char *argv[] )
+#include "misc.h"
+#include "base64.h"
+#include "arc.h"
+
+global_t global; /*ugly hack for global variable required to link*/
+
+/* encode: generates the md5 crypt used in the config file
+ * decode: decodes the passwords from the accounts in the xml file using the
+ *         bitlbee account password
+ */
+int main (int argc, char *argv[])
 {
-        char *hash, *action, line[256];
-        char* (*func)( char *, const char * );
-        
-        if( argc < 2 )
-        {
-                fprintf( stderr, "Usage: %s <password>\n\n"
-                                 "Reads from stdin, writes to stdout.\n"
-                                 "Call as \"encode\" to encode, \"decode\" to decode.\n", argv[0] );
-                return( 1 );
-        }
-        
-        hash = hashpass( argv[1] );
-        action = argv[0] + strlen( argv[0] ) - strlen( "encode" );
+        char *action;
+        char *password = NULL;
+        char *pass_buf = NULL;
+        int pass_len;
+
+        /* allow binaries to be called whatever+encode and whatever+decode
+     luckily encode and decode have the same length
+   */
+        action = argv[0] + strlen (argv[0]) - strlen ("encode");
         
-        if( strcmp( action, "encode" ) == 0 )
-        {
-                fwrite( hash, 32, 1, stdout );
-                func = obfucrypt;
-        }
-        else if( strcmp( action, "decode" ) == 0 )
-        {
-                char hash2[32];
-                
-                fread( hash2, 32, 1, stdin );
-                if( memcmp( hash, hash2, 32 ) != 0 )
-                {
-                        fprintf( stderr, "Passwords don't match. Can't decode.\n" );
-                        return( 1 );
+        if (strcmp (action, "encode") == 0)
+  {
+                password = argv[1];
+                md5_byte_t pass_md5[21];
+                md5_state_t md5_state;
+
+                if (argc != 2)
+    {
+                        printf ("Usage: %s <password>\n", argv[0]);
+                        exit (1);
                 }
-                func = deobfucrypt;
-        }
-        else
-        {
-                return( main( 0, NULL ) );
-        }
-        
-        while( fscanf( stdin, "%[^\n]255s", line ) > 0 )
-        {
-                char *out;
                 
-                /* Flush the newline */
-                fgetc( stdin );
+                /* Generate a salted md5sum of the password. Use 5 bytes for the salt
+                         (to prevent dictionary lookups of passwords) to end up with a 21-
+                         byte password hash, more convenient for base64 encoding. */
+                random_bytes (pass_md5 + 16, 5);
+                md5_init (&md5_state);
+                md5_append (&md5_state, (md5_byte_t*) password, strlen (password));
+                md5_append (&md5_state, pass_md5 + 16, 5); /* Add the salt. */
+                md5_finish (&md5_state, pass_md5);
+                /* Get the hash in base64-encoded form. */
+                pass_buf = base64_encode (pass_md5, 21);
+                printf ("%s\n", pass_buf);
+
+        }
+  else if (strcmp (action, "decode") == 0)
+  {
+
+                if (argc != 3) 
+    {
+                        printf ("Usage: %s <password> <hash_from_your_xml_file>\n", argv[0]);
+                        exit (1);
+                }
                 
-                out = func( line, argv[1] );
-                printf( "%s\n", out );
-                g_free( out );
+                pass_len = base64_decode (argv[2], (unsigned char**) &pass_buf);
+                arc_decode (pass_buf, pass_len, &password, argv[1]);
+                printf ("Your password is: %s\n", password);
+
         }
-        
-        return( 0 );
+  else
+  {
+                fprintf (stderr, "Function not implemented, implemented functions:\n  encode\n  decode\n");
+                exit (1);
+        }
+
+        /*do not free stuff, who cares?*/
+        exit (0);
 }
 
 #endif

bitlbee-1.2.3

@@ -123 +123 @@
         @-$(STRIP) $(OUTFILE)
 endif
 
-encode: crypting.c
-        $(CC) crypting.c lib/md5.c $(CFLAGS) -o encode -DCRYPTING_MAIN $(CFLAGS) $(EFLAGS) $(LFLAGS)
+encode: $(objects) $(subdirobjs) crypting.c
+        $(CC) -c crypting.c $(CFLAGS) -o crypting.o -DCRYPTING_MAIN $(CFLAGS)
+        $(CC) crypting.o lib/lib.o $(CFLAGS) -o encode $(EFLAGS) $(LFLAGS)
 
 decode: encode
         cp encode decode