--- a/libpurple/protocols/myspace/myspace.h Tue Jul 03 05:15:36 2007 +0000 +++ b/libpurple/protocols/myspace/myspace.h Tue Jul 03 05:21:55 2007 +0000 @@ -64,11 +64,6 @@ * you want to actually use the plugin! */ /*#define MSIM_SELF_TEST */ -/* RC4 didn't make it into Libpurple 2.0.0's cipher suite, so we have - * to use our own RC4 code (from Samba) by not defining this. */ -/* RC4 is in Libpurple 2.0.1, so define this. */ -#define MSIM_USE_PURPLE_RC4 - /* Define to fake our own user account always being online. Needed * because msim doesn't allow adding oneself to ones list. */ #define MSIM_FAKE_SELF_ONLINE @@ -262,46 +257,4 @@ void init_plugin(PurplePlugin *plugin); - - -#ifndef MSIM_USE_PURPLE_RC4 -/* - Unix SMB/CIFS implementation. - - a partial implementation of RC4 designed for use in the - SMB authentication protocol - - Copyright (C) Andrew Tridgell 1998 - - $Id: crypt-rc4.h 12116 2004-09-27 23:29:22Z guy $ - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -*/ - -typedef struct _rc4_state_struct { - guchar s_box[256]; - guchar index_i; - guchar index_j; -} rc4_state_struct; - -void crypt_rc4_init(rc4_state_struct *rc4_state, - const guchar *key, int key_len); - -void crypt_rc4(rc4_state_struct *rc4_state, guchar *data, int data_len); -#endif /* !MSIM_USE_PURPLE_RC4 */ - - - #endif /* !_MYSPACE_MYSPACE_H */