diff src/protocols/oscar/auth.c @ 10693:f7431a6ff0cb

[gaim-migrate @ 12245] Print the screen name in an oscar debug message, and use the non-sucky authentication scheme for ICQ (MD5 instead of XOR). ...as she looked up into my eyes, her vision borrowed mine... committer: Tailor Script <[e-mail]>

--- a/src/protocols/oscar/auth.c	Mon Mar 14 01:55:50 2005 +0000
+++ b/src/protocols/oscar/auth.c	Mon Mar 14 03:27:01 2005 +0000
@@ -13,6 +13,7 @@
 
 #include <ctype.h>
 
+#ifdef USE_XOR_FOR_ICQ
 /**
  * Encode a password using old XOR method
  *
@@ -52,6 +53,7 @@
 
 	return 0;
 }
+#endif
 
 #ifdef USE_OLD_MD5
 static int aim_encode_password_md5(const char *password, const char *key, fu8_t *digest)
@@ -131,6 +133,7 @@
 	return 0;
 }
 
+#ifdef USE_XOR_FOR_ICQ
 /*
  * Part two of the ICQ hack.  Note the ignoring of the key.
  */
@@ -178,6 +181,7 @@
 
 	return 0;
 }
+#endif
 
 /*
  * Subtype 0x0002
@@ -218,9 +222,11 @@
 	if (!ci || !sn || !password)
 		return -EINVAL;
 
+#ifdef USE_XOR_FOR_ICQ
 	/* If we're signing on an ICQ account then use the older, XOR login method */
 	if (isdigit(sn[0]))
 		return goddamnicq2(sess, conn, sn, password, ci);
+#endif
 
 	if (!(fr = aim_tx_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 1152)))
 		return -ENOMEM;
@@ -396,6 +402,7 @@
 	return ret;
 }
 
+#ifdef USE_XOR_FOR_ICQ
 /*
  * Subtype 0x0007 (kind of) - Send a fake type 0x0007 SNAC to the client
  *
@@ -443,6 +450,7 @@
 
 	return 0;
 }
+#endif
 
 /*
  * Subtype 0x0006
@@ -463,8 +471,10 @@
 	if (!sess || !conn || !sn)
 		return -EINVAL;
 
+#ifdef USE_XOR_FOR_ICQ
 	if (isdigit(sn[0]))
 		return goddamnicq(sess, conn, sn);
+#endif
 
 	aim_sendflapver(sess, conn);