Changes in storage_xml.c [a7b5925:55078f5]

File:

• storage_xml.c (modified) (6 diffs)

storage_xml.c

@@ -27 +27 @@
 #include "bitlbee.h"
 #include "base64.h"
-#include "arc.h"
+#include "rc4.h"
 #include "md5.h"
 
@@ -132 +132 @@
         {
                 char *protocol, *handle, *server, *password = NULL, *autoconnect;
-                char *pass_b64 = NULL;
-                unsigned char *pass_cr = NULL;
+                char *pass_b64 = NULL, *pass_rc4 = NULL;
                 int pass_len;
                 struct prpl *prpl = NULL;
@@ -152 +151 @@
                         g_set_error( error, G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT,
                                      "Unknown protocol: %s", protocol );
-                else if( ( pass_len = base64_decode( pass_b64, (unsigned char**) &pass_cr ) ) &&
-                                         arc_decode( pass_cr, pass_len, &password, xd->given_pass ) )
+                else if( ( pass_len = base64_decode( pass_b64, (unsigned char**) &pass_rc4 ) ) &&
+                                rc4_decode( (unsigned char*) pass_rc4, pass_len,
+                                            (unsigned char**) &password, xd->given_pass ) )
                 {
                         xd->current_account = account_add( irc, prpl, handle, password );
@@ -169 +169 @@
                 }
                 
-                g_free( pass_cr );
+                g_free( pass_rc4 );
                 g_free( password );
         }
@@ -410 +410 @@
         md5_finish( &md5_state, pass_md5 );
         /* Save the hash in base64-encoded form. */
-        pass_buf = base64_encode( pass_md5, 21 );
+        pass_buf = base64_encode( (char*) pass_md5, 21 );
         
         if( !xml_printf( fd, 0, "<user nick=\"%s\" password=\"%s\" version=\"%d\">\n", irc->nick, pass_buf, XML_FORMAT_VERSION ) )
@@ -424 +424 @@
         for( acc = irc->accounts; acc; acc = acc->next )
         {
-                unsigned char *pass_cr;
-                char *pass_b64;
+                char *pass_rc4, *pass_b64;
                 int pass_len;
                 
-                pass_len = arc_encode( acc->pass, strlen( acc->pass ), (unsigned char**) &pass_cr, irc->password );
-                pass_b64 = base64_encode( pass_cr, pass_len );
-                g_free( pass_cr );
+                pass_len = rc4_encode( (unsigned char*) acc->pass, strlen( acc->pass ), (unsigned char**) &pass_rc4, irc->password );
+                pass_b64 = base64_encode( pass_rc4, pass_len );
+                g_free( pass_rc4 );
                 
                 if( !xml_printf( fd, 1, "<account protocol=\"%s\" handle=\"%s\" password=\"%s\" autoconnect=\"%d\"", acc->prpl->name, acc->user, pass_b64, acc->auto_connect ) )