Changes in / [2896674:acd61b9]

Files:

• lib/Makefile (modified) (1 diff)
• lib/arc.c (deleted)
• lib/arc.h (deleted)
• lib/rc4.c (added)
• lib/rc4.h (added)
• storage_xml.c (modified) (5 diffs)
• tests/Makefile (modified) (1 diff)
• tests/check.c (modified) (2 diffs)
• tests/check_arc.c (deleted)

lib/Makefile

@@ -10 +10 @@
 
 # [SH] Program variables
-objects = arc.o base64.o $(EVENT_HANDLER) http_client.o ini.o md5.o misc.o proxy.o sha.o $(SSL_CLIENT) url.o
+objects = base64.o $(EVENT_HANDLER) http_client.o ini.o md5.o misc.o proxy.o rc4.o sha.o $(SSL_CLIENT) url.o
 
 CFLAGS += -Wall

storage_xml.c

@@ -27 +27 @@
 #include "bitlbee.h"
 #include "base64.h"
-#include "arc.h"
+#include "rc4.h"
 #include "md5.h"
 
@@ -133 +133 @@
                 char *protocol, *handle, *server, *password = NULL, *autoconnect;
                 char *pass_b64 = NULL;
-                unsigned char *pass_cr = NULL;
+                unsigned char *pass_rc4 = 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_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( pass_rc4, pass_len, &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 );
         }
@@ -424 +424 @@
         for( acc = irc->accounts; acc; acc = acc->next )
         {
-                unsigned char *pass_cr;
+                unsigned char *pass_rc4;
                 char *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( 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 ) )

tests/Makefile

@@ -13 +13 @@
 main_objs = account.o bitlbee.o conf.o crypting.o help.o ipc.o irc.o irc_commands.o log.o nick.o query.o root_commands.o set.o storage.o storage_xml.o storage_text.o user.o 
 
-test_objs = check.o check_util.o check_nick.o check_md5.o check_arc.o check_irc.o check_help.o check_user.o check_crypting.o check_set.o
+test_objs = check.o check_util.o check_nick.o check_md5.o check_irc.o check_help.o check_user.o check_crypting.o check_set.o
 
 check: $(test_objs) $(addprefix ../, $(main_objs)) ../protocols/protocols.o ../lib/lib.o

tests/check.c

@@ -47 +47 @@
 /* From check_md5.c */
 Suite *md5_suite(void);
-
-/* From check_arc.c */
-Suite *arc_suite(void);
 
 /* From check_irc.c */
@@ -105 +102 @@
         srunner_add_suite(sr, nick_suite());
         srunner_add_suite(sr, md5_suite());
-        srunner_add_suite(sr, arc_suite());
         srunner_add_suite(sr, irc_suite());
         srunner_add_suite(sr, help_suite());