Changeset a7b5925 for storage_xml.c

Timestamp:

2007-10-07T20:42:37Z (17 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

2305488

Parents:

9334cc2

Message:

Renaming RC4 to ArcFour (possible trademark issues).

File:

• storage_xml.c (modified) (5 diffs)

storage_xml.c

@@ -27 +27 @@
 #include "bitlbee.h"
 #include "base64.h"
-#include "rc4.h"
+#include "arc.h"
 #include "md5.h"
 
@@ -133 +133 @@
                 char *protocol, *handle, *server, *password = NULL, *autoconnect;
                 char *pass_b64 = NULL;
-                unsigned char *pass_rc4 = NULL;
+                unsigned char *pass_cr = NULL;
                 int pass_len;
                 struct prpl *prpl = NULL;
@@ -152 +152 @@
                         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_rc4 ) ) &&
-                                         rc4_decode( pass_rc4, pass_len, &password, xd->given_pass ) )
+                else if( ( pass_len = base64_decode( pass_b64, (unsigned char**) &pass_cr ) ) &&
+                                         arc_decode( pass_cr, pass_len, &password, xd->given_pass ) )
                 {
                         xd->current_account = account_add( irc, prpl, handle, password );
@@ -169 +169 @@
                 }
                 
-                g_free( pass_rc4 );
+                g_free( pass_cr );
                 g_free( password );
         }
@@ -424 +424 @@
         for( acc = irc->accounts; acc; acc = acc->next )
         {
-                unsigned char *pass_rc4;
+                unsigned char *pass_cr;
                 char *pass_b64;
                 int pass_len;
                 
-                pass_len = rc4_encode( acc->pass, strlen( acc->pass ), (unsigned char**) &pass_rc4, irc->password );
-                pass_b64 = base64_encode( pass_rc4, pass_len );
-                g_free( pass_rc4 );
+                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 );
                 
                 if( !xml_printf( fd, 1, "<account protocol=\"%s\" handle=\"%s\" password=\"%s\" autoconnect=\"%d\"", acc->prpl->name, acc->user, pass_b64, acc->auto_connect ) )