Mercurial > pidgin.yaz

changeset 741:58a6e6e26695

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 751] oscar logins work better (?), aliases in convo windows. committer: Tailor Script <tailor@pidgin.im>
author Eric Warmenhoven <eric@warmenhoven.org>
date Tue, 22 Aug 2000 23:38:47 +0000
parents 01d3c96867e2
children 85495ad038cf
files libfaim/CHANGES libfaim/CHANGES.gaim libfaim/Makefile.am libfaim/README.gaim libfaim/aim_login.c libfaim/aim_rxhandlers.c libfaim/faim/aim.h libfaim/faim/faimconfig.h libfaim/md5.c libfaim/md5.h src/conversation.c src/oscar.c
diffstat 12 files changed, 614 insertions(+), 131 deletions(-) [+]
line wrap: on
line diff
--- a/libfaim/CHANGES	Tue Aug 22 19:23:36 2000 +0000
+++ b/libfaim/CHANGES	Tue Aug 22 23:38:47 2000 +0000
@@ -1,6 +1,11 @@
 
 No release numbers
 ------------------
+ - Mon Aug 21 22:00:18 UTC 2000
+   - Implement SNAC login MD5 (thanks to Sonuvbob for that one)
+   - Clear out all that old login cruft. Much cleaner now.
+   - REQUIRES CLIENT CHANGES (see faimtest)
+
  - Fri Aug 18 19:52:54 UTC 2000
    - Fix the non-pthread bug
 
--- a/libfaim/CHANGES.gaim	Tue Aug 22 19:23:36 2000 +0000
+++ b/libfaim/CHANGES.gaim	Tue Aug 22 23:38:47 2000 +0000
@@ -1,3 +1,7 @@
+
+Tue Aug 22 23:34:47 UTC 2000 EWarmenhoven
+	- New login method. Don't ask me anything about it. The only
+	  thing I know about Oscar is its name.
 
 Fri Aug 18 00:21:11 UTC 2000 EWarmenhoven
 	- Adam got rid of a lot of leaks thanks to me :)
--- a/libfaim/Makefile.am	Tue Aug 22 19:23:36 2000 +0000
+++ b/libfaim/Makefile.am	Tue Aug 22 23:38:47 2000 +0000
@@ -1,6 +1,6 @@
 noinst_LIBRARIES = libfaim.a
 
-EXTRA_DIST = faim/aim.h faim/aim_cbtypes.h faim/faimconfig.h README \
+EXTRA_DIST = faim/aim.h faim/aim_cbtypes.h faim/faimconfig.h md5.h README \
 		README.gaim CHANGES CHANGES.gaim COPYING BUGS AUTHORS
 
 libfaim_a_SOURCES = 	aim_ads.c		\
@@ -23,7 +23,8 @@
 			aim_snac.c		\
 			aim_tlv.c		\
 			aim_txqueue.c		\
-			aim_util.c
+			aim_util.c		\
+			md5.c
 
 CFLAGS += -DAIM_BUILDDATE=\"`date +%Y%m%d`\" -DAIM_BUILDTIME=\"`date +%H%M%S`\"
 
--- a/libfaim/README.gaim	Tue Aug 22 19:23:36 2000 +0000
+++ b/libfaim/README.gaim	Tue Aug 22 23:38:47 2000 +0000
@@ -48,7 +48,6 @@
  - inviting someone
  - getting invited
  - refreshing the chatlist in the preferences dialog
-ICQ!!! (Use your UIN instead of your SN to sign on)
 Direct IM (aka IM Image, for sounds and pictures)
 
 CURRENTLY UNSUPPORTED FEATURES
@@ -71,14 +70,6 @@
 - The permit/deny list stuff is really warped. I've commented it out; the code
 in libfaim is untested and it's causing way too many problems.
 
-- "Allow anyone" and "Deny some" serve the same function. That's not a bug. But
-"Allow anyone" works all the time (?) and "Deny some" doesn't work some of the
-time. That's a bug.
-
-- If you receive a message that's too large, gaim segfaults. I haven't watched
-this in gdb or gotten a backtrace on it, so I'm not exactly sure what the
-problem is. I think this actually happens on the TOC side of things too.
-
 - Gaim/TOC can do some RVOUS actions, and Gaim/Faim can do others. This is not
 because there is any difference in the protocols as far as the actual transfer
 is concerned. The only difference is what has been implemented and what hasn't
--- a/libfaim/aim_login.c	Tue Aug 22 19:23:36 2000 +0000
+++ b/libfaim/aim_login.c	Tue Aug 22 23:38:47 2000 +0000
@@ -7,6 +7,9 @@
 
 #include <faim/aim.h>
 
+#include "md5.h"
+
+static int aim_encode_password_md5(const char *password, const char *key, md5_byte_t *digest);
 
 /*
  * FIXME: Reimplement the TIS stuff.
@@ -34,7 +37,6 @@
   return aim_tx_enqueue(sess, newpacket);
 }
 
-#ifdef SNACLOGIN
 /*
  * In AIM 3.5 protocol, the first stage of login is to request
  * login from the Authorizer, passing it the screen name
@@ -62,7 +64,6 @@
   newpacket->lock = 0;
   return aim_tx_enqueue(sess, newpacket);
 }
-#endif /* SNACLOGIN */
 
 /*
  * send_login(int socket, char *sn, char *password)
@@ -76,11 +77,11 @@
  */
 int aim_send_login (struct aim_session_t *sess,
 		    struct aim_conn_t *conn, 
-		    char *sn, char *password, struct client_info_s *clientinfo)
+		    char *sn, char *password, struct client_info_s *clientinfo,
+		    char *key)
 {
-  u_char *password_encoded = NULL;  /* to store encoded password */
   int curbyte=0;
-  int icqmode = 0;
+  md5_byte_t digest[16];
   
   struct command_tx_struct *newpacket;
 
@@ -90,67 +91,16 @@
   if (!(newpacket = aim_tx_new(AIM_FRAMETYPE_OSCAR, 0x0002, conn, 1152)))
     return -1;
 
-  /*
-   * For ICQ logins, the client version must be at
-   * least as high as ICQ2000a.
-   */
-  if ((sn[0] >= '0') && (sn[0] <= '9')) {
-    icqmode = 1; /* needs a different password encoding */
-    if (clientinfo && (clientinfo->major < 4)) {
-      printf("faim: icq: version must be at least 4.30.3141 for ICQ OSCAR login\n");
-    }
-    if (strlen(password) > 8) {
-      printf("faim: icq: password too long (8 char max)\n");
-    }
-  }
-
-#ifdef SNACLOGIN 
-  newpacket->commandlen = 10;
-  newpacket->commandlen += 2 + 2 + strlen(sn);
-  newpacket->commandlen += 2 + 2 + strlen(password);
-  newpacket->commandlen += 2 + 2 + strlen(clientinfo->clientstring);
-  newpacket->commandlen += 56;
-  
   newpacket->lock = 1;
 
+  newpacket->hdr.oscar.type = 0x02;
+  
   curbyte = aim_putsnac(newpacket->data+curbyte, 0x0017, 0x0002, 0x0000, 0x00010000);
+
   curbyte+= aim_puttlv_str(newpacket->data+curbyte, 0x0001, strlen(sn), sn);
-  password_encoded = (u_char *) malloc(strlen(password));
-  aim_encode_password(password, password_encoded);
-  curbyte+= aim_puttlv_str(newpacket->data+curbyte, 0x0002, strlen(password), password_encoded);
-  curbyte+= aim_puttlv_str(newpacket->data+curbyte, 0x0003, 
-			   strlen(clientinfo->clientstring), 
-			   clientinfo->clientstring);
-  /* XXX: should use clientinfo provided version info */
-  curbyte+= aim_puttlv_16(newpacket->data+curbyte, 0x0016, 0x0004);
-  curbyte+= aim_puttlv_16(newpacket->data+curbyte, 0x0017, 0x0003);
-  curbyte+= aim_puttlv_16(newpacket->data+curbyte, 0x0018, 0x0005);
-  curbyte+= aim_puttlv_16(newpacket->data+curbyte, 0x0019, 0x0000);
-  curbyte+= aim_puttlv_16(newpacket->data+curbyte, 0x001a, 0x0686);
-  curbyte+= aim_puttlv_str(newpacket->data+curbyte, 0x0001, 0x0002, clientinfo->country);
-  curbyte+= aim_puttlv_str(newpacket->data+curbyte, 0x0001, 0x0002, clientinfo->lang);
-  curbyte+= aim_puttlv_32(newpacket->data+curbyte, 0x0014, 0x0000002a);
-  curbyte+= aim_puttlv_16(newpacket->data+curbyte, 0x0009, 0x0015);
-#else
   
-  newpacket->lock = 1;
-  newpacket->hdr.oscar.type = 0x01;
-
-  /*
-   * These four bytes are actually the FLAP version information.
-   * They're sent here for convenience.  I suppose they could
-   * be seperated out into a seperate FLAP, but this is where
-   * everyone else sends them.
-   */
-  curbyte += aimutil_put16(newpacket->data+curbyte, 0x0000);
-  curbyte += aimutil_put16(newpacket->data+curbyte, 0x0001);
-
-  curbyte += aim_puttlv_str(newpacket->data+curbyte, 0x0001, strlen(sn), sn);
-
-  password_encoded = (char *) malloc(strlen(password));
-  aim_encode_password(password, password_encoded);
-  curbyte += aim_puttlv_str(newpacket->data+curbyte, 0x0002, strlen(password), password_encoded);
-  free(password_encoded);
+  aim_encode_password_md5(password, key, digest);
+  curbyte+= aim_puttlv_str(newpacket->data+curbyte, 0x0025, 16, digest);
   
   /* XXX is clientstring required by oscar? */
   if (strlen(clientinfo->clientstring))
@@ -161,8 +111,9 @@
   curbyte += aim_puttlv_16(newpacket->data+curbyte, 0x0018, clientinfo->minor);
   curbyte += aim_puttlv_16(newpacket->data+curbyte, 0x0019, clientinfo->minor2);
   curbyte += aim_puttlv_16(newpacket->data+curbyte, 0x001a, clientinfo->build);
-
+  
   curbyte += aim_puttlv_32(newpacket->data+curbyte, 0x0014, clientinfo->unknown);
+  curbyte += aim_puttlv_16(newpacket->data+curbyte, 0x0009, 0x0015);
 
   if (strlen(clientinfo->country))
     curbyte += aim_puttlv_str(newpacket->data+curbyte, 0x000e, strlen(clientinfo->country), clientinfo->country);
@@ -175,12 +126,24 @@
     curbyte += aim_puttlv_str(newpacket->data+curbyte, 0x000f, 2, "en");
   
   newpacket->commandlen = curbyte;
-#endif
 
   newpacket->lock = 0;
   return aim_tx_enqueue(sess, newpacket);
 }
 
+static int aim_encode_password_md5(const char *password, const char *key, md5_byte_t *digest)
+{
+  md5_state_t state;
+
+  md5_init(&state);	
+  md5_append(&state, (const md5_byte_t *)key, strlen(key));
+  md5_append(&state, (const md5_byte_t *)password, strlen(password));
+  md5_append(&state, (const md5_byte_t *)AIM_MD5_STRING, strlen(AIM_MD5_STRING));
+  md5_finish(&state, (md5_byte_t *)digest);
+
+  return 0;
+}
+
 /*
  *  int encode_password(
  *                      const char *password,
@@ -196,8 +159,11 @@
  * The encoding_table seems to be a fixed set of values.  We'll
  * hope it doesn't change over time!  
  *
+ * NOTE: This is no longer used. Its here for historical reference.
+ *
  */
-int aim_encode_password(const char *password, u_char *encoded)
+#if 0
+static int aim_encode_password(const char *password, unsigned char *encoded)
 {
   u_char encoding_table[] = {
 #if 0 /* old v1 table */
@@ -220,6 +186,7 @@
 
   return 0;
 }
+#endif
 
 /*
  * This is sent back as a general response to the login command.
@@ -243,12 +210,12 @@
   /*
    * Read block of TLVs.  All further data is derived
    * from what is parsed here.
+   *
+   * For SNAC login, there's a 17/3 SNAC header in front.
+   *
    */
-#ifdef SNACLOGIN
   tlvlist = aim_readtlvchain(command->data+10, command->commandlen-10);
-#else
-  tlvlist = aim_readtlvchain(command->data, command->commandlen);
-#endif
+
   /*
    * No matter what, we should have a screen name.
    */
@@ -301,11 +268,8 @@
       
   }
 
-#ifdef SNACLOGIN
   userfunc = aim_callhandler(command->conn, 0x0017, 0x0003);
-#else
-  userfunc = aim_callhandler(command->conn, AIM_CB_FAM_SPECIAL, AIM_CB_SPECIAL_AUTHSUCCESS);
-#endif
+
   if (userfunc)
     ret = userfunc(sess, command);
 
@@ -328,6 +292,33 @@
 }
 
 /*
+ * Middle handler for 0017/0007 SNACs.  Contains the auth key prefixed
+ * by only its length in a two byte word.
+ *
+ * Calls the client, which should then use the value to call aim_send_login.
+ *
+ */
+int aim_authkeyparse(struct aim_session_t *sess, struct command_rx_struct *command)
+{
+  unsigned char *key;
+  int keylen;
+  int ret = 1;
+  rxcallback_t userfunc;
+
+  keylen = aimutil_get16(command->data+10);
+  key = malloc(keylen+1);
+  memcpy(key, command->data+12, keylen);
+  key[keylen] = '\0';
+  
+  if ((userfunc = aim_callhandler(command->conn, 0x0017, 0x0007)))
+    ret = userfunc(sess, command, key);
+
+  free(key);  
+
+  return ret;
+}
+
+/*
  * Generate an authorization response.  
  *
  * You probably don't want this unless you're writing an AIM server.
--- a/libfaim/aim_rxhandlers.c	Tue Aug 22 19:23:36 2000 +0000
+++ b/libfaim/aim_rxhandlers.c	Tue Aug 22 23:38:47 2000 +0000
@@ -352,35 +352,31 @@
 	  
 	  switch (family) {
 	    /* New login protocol */
-#ifdef SNACLOGIN
 	  case 0x0017:
 	    if (subtype == 0x0001)
 	      workingPtr->handled = aim_callhandler_noparam(sess, workingPtr->conn, 0x0017, 0x0001, workingPtr);
 	    else if (subtype == 0x0003)
 	      workingPtr->handled = aim_authparse(sess, workingPtr);
 	    else if (subtype == 0x0007)
-	      workingPtr->handled = aim_callhandler_noparam(sess, workingPtr->conn, 0x0017, 0x0007, workingPtr);
+	      workingPtr->handled = aim_authkeyparse(sess, workingPtr);
 	    else
 	      workingPtr->handled = aim_callhandler_noparam(sess, workingPtr->conn, 0x0017, 0xffff, workingPtr);
 	    break;
-#else	
-	    /* XXX: this isnt foolproof */
-	  case 0x0001:
-	    workingPtr->handled = aim_callhandler_noparam(sess, workingPtr->conn, AIM_CB_FAM_GEN, AIM_CB_GEN_SERVERREADY, workingPtr);
-	    break;
-	  case 0x0007:
-	    if (subtype == 0x0005)
-	      workingPtr->handled = aim_callhandler_noparam(sess, workingPtr->conn, AIM_CB_FAM_ADM, AIM_CB_ADM_INFOCHANGE_REPLY, workingPtr);
+         case 0x0007:
+           if (subtype == 0x0005)
+             workingPtr->handled = aim_callhandler_noparam(sess, workingPtr->conn, AIM_CB_FAM_ADM, AIM_CB_ADM_INFOCHANGE_REPLY, workingPtr);
+           break;
+         case AIM_CB_FAM_SPECIAL:
+           if (subtype == AIM_CB_SPECIAL_DEBUGCONN_CONNECT) {
+             workingPtr->handled = aim_callhandler_noparam(sess, workingPtr->conn, family, subtype, workingPtr);
+             break;
+           } /* others fall through */
+         default:
+#if 0
+           /* Old login protocol */
+           /* any user callbacks will be called from here */
+           workingPtr->handled = aim_authparse(sess, workingPtr);
 	    break;
-	  case AIM_CB_FAM_SPECIAL:
-	    if (subtype == AIM_CB_SPECIAL_DEBUGCONN_CONNECT) {
-	      workingPtr->handled = aim_callhandler_noparam(sess, workingPtr->conn, family, subtype, workingPtr);
-	      break;
-	    } /* others fall through */
-	  default:
-	    /* Old login protocol */
-	    /* any user callbacks will be called from here */
-	    workingPtr->handled = aim_authparse(sess, workingPtr);
 #endif
 	  }
 	}
--- a/libfaim/faim/aim.h	Tue Aug 22 19:23:36 2000 +0000
+++ b/libfaim/faim/aim.h	Tue Aug 22 23:38:47 2000 +0000
@@ -113,6 +113,8 @@
  */
 #define AIM_COOKIELEN            0x100
 
+#define AIM_MD5_STRING "AOL Instant Messenger (SM)"
+
 #if debug > 0
 #define faimdprintf(l, x...) {if (l >= debug) printf(x); }
 #else
@@ -399,9 +401,7 @@
 /* aim_login.c */
 int aim_sendconnack(struct aim_session_t *sess, struct aim_conn_t *conn);
 int aim_request_login (struct aim_session_t *sess, struct aim_conn_t *conn, char *sn);
-int aim_send_login (struct aim_session_t *, struct aim_conn_t *, char *, char *, struct client_info_s *);
-int aim_encode_password(const char *, u_char *);
-int aimicq_encode_password(const char *password, u_char *encoded);
+int aim_send_login (struct aim_session_t *, struct aim_conn_t *, char *, char *, struct client_info_s *, char *key);
 unsigned long aim_sendauthresp(struct aim_session_t *sess, 
 			       struct aim_conn_t *conn, 
 			       char *sn, char *bosip, 
@@ -409,6 +409,7 @@
 			       int regstatus);
 int aim_gencookie(unsigned char *buf);
 int aim_sendserverready(struct aim_session_t *sess, struct aim_conn_t *conn);
+int aim_authkeyparse(struct aim_session_t *sess, struct command_rx_struct *command);
 unsigned long aim_sendredirect(struct aim_session_t *sess, 
 			       struct aim_conn_t *conn, 
 			       unsigned short servid, 
--- a/libfaim/faim/faimconfig.h	Tue Aug 22 19:23:36 2000 +0000
+++ b/libfaim/faim/faimconfig.h	Tue Aug 22 23:38:47 2000 +0000
@@ -54,20 +54,6 @@
 #define USE_SNAC_FOR_IMS
 
 /*
- * As of AIM 3.5 or so, AOL as added a better way of
- * logging in.  Define this to use it instead of the 
- * old Version 1.0 way.  
- *
- * The largest caveat here is that I have no idea
- * how to encode passwords using the new 3.5 way.
- * Until someone figures that out the...
- *
- * Default: Undefined.
- *
- */
-#undef SNACLOGIN
-
-/*
  * Default Authorizer server name and TCP port for the OSCAR farm.  
  *
  * You shouldn't need to change this unless you're writing
@@ -85,15 +71,6 @@
 #define FAIM_LOGIN_PORT 5190
 
 /*
- * MAX_READ_ERROR can be decreased if you find dead connections
- * lingering around, and not getting detected, for too long.
- *
- * Default: 100
- *
- */
-#define MAX_READ_ERROR 100
-
-/*
  * The integer extraction/copying functions in aim_util.c have
  * both a function version and a macro version.  The macro 
  * version is suggested.  Since the function version is more
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libfaim/md5.c	Tue Aug 22 23:38:47 2000 +0000
@@ -0,0 +1,392 @@
+/*
+  Copyright (C) 1999 Aladdin Enterprises.  All rights reserved.
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  L. Peter Deutsch
+  ghost@aladdin.com
+
+ */
+/*$Id: md5.c 751 2000-08-22 23:38:47Z warmenhoven $ */
+/*
+  Independent implementation of MD5 (RFC 1321).
+
+  This code implements the MD5 Algorithm defined in RFC 1321.
+  It is derived directly from the text of the RFC and not from the
+  reference implementation.
+
+  The original and principal author of md5.c is L. Peter Deutsch
+  <ghost@aladdin.com>.  Other authors are noted in the change history
+  that follows (in reverse chronological order):
+
+  1999-11-04 lpd Edited comments slightly for automatic TOC extraction.
+  1999-10-18 lpd Fixed typo in header comment (ansi2knr rather than md5).
+  1999-05-03 lpd Original version.
+ */
+
+#include "md5.h"
+
+#ifdef TEST
+/*
+ * Compile with -DTEST to create a self-contained executable test program.
+ * The test program should print out the same values as given in section
+ * A.5 of RFC 1321, reproduced below.
+ */
+#include <string.h>
+main()
+{
+    static const char *const test[7] = {
+	"", /*d41d8cd98f00b204e9800998ecf8427e*/
+	"945399884.61923487334tuvga", /*0cc175b9c0f1b6a831c399e269772661*/
+	"abc", /*900150983cd24fb0d6963f7d28e17f72*/
+	"message digest", /*f96b697d7cb7938d525a2f31aaf161d0*/
+	"abcdefghijklmnopqrstuvwxyz", /*c3fcd3d76192e4007dfb496cca67e13b*/
+	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789",
+				/*d174ab98d277d9f5a5611c2c9f419d9f*/
+	"12345678901234567890123456789012345678901234567890123456789012345678901234567890" /*57edf4a22be3c955ac49da2e2107b67a*/
+    };
+    int i;
+
+    for (i = 0; i < 7; ++i) {
+	md5_state_t state;
+	md5_byte_t digest[16];
+	int di;
+
+	md5_init(&state);
+	md5_append(&state, (const md5_byte_t *)test[i], strlen(test[i]));
+	md5_finish(&state, digest);
+	printf("MD5 (\"%s\") = ", test[i]);
+	for (di = 0; di < 16; ++di)
+	    printf("%02x", digest[di]);
+	printf("\n");
+    }
+    return 0;
+}
+#endif /* TEST */
+
+
+/*
+ * For reference, here is the program that computed the T values.
+ */
+#if 0
+#include <math.h>
+main()
+{
+    int i;
+    for (i = 1; i <= 64; ++i) {
+	unsigned long v = (unsigned long)(4294967296.0 * fabs(sin((double)i)));
+	printf("#define T%d 0x%08lx\n", i, v);
+    }
+    return 0;
+}
+#endif
+/*
+ * End of T computation program.
+ */
+#define T1 0xd76aa478
+#define T2 0xe8c7b756
+#define T3 0x242070db
+#define T4 0xc1bdceee
+#define T5 0xf57c0faf
+#define T6 0x4787c62a
+#define T7 0xa8304613
+#define T8 0xfd469501
+#define T9 0x698098d8
+#define T10 0x8b44f7af
+#define T11 0xffff5bb1
+#define T12 0x895cd7be
+#define T13 0x6b901122
+#define T14 0xfd987193
+#define T15 0xa679438e
+#define T16 0x49b40821
+#define T17 0xf61e2562
+#define T18 0xc040b340
+#define T19 0x265e5a51
+#define T20 0xe9b6c7aa
+#define T21 0xd62f105d
+#define T22 0x02441453
+#define T23 0xd8a1e681
+#define T24 0xe7d3fbc8
+#define T25 0x21e1cde6
+#define T26 0xc33707d6
+#define T27 0xf4d50d87
+#define T28 0x455a14ed
+#define T29 0xa9e3e905
+#define T30 0xfcefa3f8
+#define T31 0x676f02d9
+#define T32 0x8d2a4c8a
+#define T33 0xfffa3942
+#define T34 0x8771f681
+#define T35 0x6d9d6122
+#define T36 0xfde5380c
+#define T37 0xa4beea44
+#define T38 0x4bdecfa9
+#define T39 0xf6bb4b60
+#define T40 0xbebfbc70
+#define T41 0x289b7ec6
+#define T42 0xeaa127fa
+#define T43 0xd4ef3085
+#define T44 0x04881d05
+#define T45 0xd9d4d039
+#define T46 0xe6db99e5
+#define T47 0x1fa27cf8
+#define T48 0xc4ac5665
+#define T49 0xf4292244
+#define T50 0x432aff97
+#define T51 0xab9423a7
+#define T52 0xfc93a039
+#define T53 0x655b59c3
+#define T54 0x8f0ccc92
+#define T55 0xffeff47d
+#define T56 0x85845dd1
+#define T57 0x6fa87e4f
+#define T58 0xfe2ce6e0
+#define T59 0xa3014314
+#define T60 0x4e0811a1
+#define T61 0xf7537e82
+#define T62 0xbd3af235
+#define T63 0x2ad7d2bb
+#define T64 0xeb86d391
+
+static void
+md5_process(md5_state_t *pms, const md5_byte_t *data /*[64]*/)
+{
+    md5_word_t
+	a = pms->abcd[0], b = pms->abcd[1],
+	c = pms->abcd[2], d = pms->abcd[3];
+    md5_word_t t;
+
+#ifndef ARCH_IS_BIG_ENDIAN
+# define ARCH_IS_BIG_ENDIAN 1	/* slower, default implementation */
+#endif
+#if ARCH_IS_BIG_ENDIAN
+
+    /*
+     * On big-endian machines, we must arrange the bytes in the right
+     * order.  (This also works on machines of unknown byte order.)
+     */
+    md5_word_t X[16];
+    const md5_byte_t *xp = data;
+    int i;
+
+    for (i = 0; i < 16; ++i, xp += 4)
+	X[i] = xp[0] + (xp[1] << 8) + (xp[2] << 16) + (xp[3] << 24);
+
+#else  /* !ARCH_IS_BIG_ENDIAN */
+
+    /*
+     * On little-endian machines, we can process properly aligned data
+     * without copying it.
+     */
+    md5_word_t xbuf[16];
+    const md5_word_t *X;
+
+    if (!((data - (const md5_byte_t *)0) & 3)) {
+	/* data are properly aligned */
+	X = (const md5_word_t *)data;
+    } else {
+	/* not aligned */
+	memcpy(xbuf, data, 64);
+	X = xbuf;
+    }
+#endif
+
+#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32 - (n))))
+
+    /* Round 1. */
+    /* Let [abcd k s i] denote the operation
+       a = b + ((a + F(b,c,d) + X[k] + T[i]) <<< s). */
+#define F(x, y, z) (((x) & (y)) | (~(x) & (z)))
+#define SET(a, b, c, d, k, s, Ti)\
+  t = a + F(b,c,d) + X[k] + Ti;\
+  a = ROTATE_LEFT(t, s) + b
+    /* Do the following 16 operations. */
+    SET(a, b, c, d,  0,  7,  T1);
+    SET(d, a, b, c,  1, 12,  T2);
+    SET(c, d, a, b,  2, 17,  T3);
+    SET(b, c, d, a,  3, 22,  T4);
+    SET(a, b, c, d,  4,  7,  T5);
+    SET(d, a, b, c,  5, 12,  T6);
+    SET(c, d, a, b,  6, 17,  T7);
+    SET(b, c, d, a,  7, 22,  T8);
+    SET(a, b, c, d,  8,  7,  T9);
+    SET(d, a, b, c,  9, 12, T10);
+    SET(c, d, a, b, 10, 17, T11);
+    SET(b, c, d, a, 11, 22, T12);
+    SET(a, b, c, d, 12,  7, T13);
+    SET(d, a, b, c, 13, 12, T14);
+    SET(c, d, a, b, 14, 17, T15);
+    SET(b, c, d, a, 15, 22, T16);
+#undef SET
+
+     /* Round 2. */
+     /* Let [abcd k s i] denote the operation
+          a = b + ((a + G(b,c,d) + X[k] + T[i]) <<< s). */
+#define G(x, y, z) (((x) & (z)) | ((y) & ~(z)))
+#define SET(a, b, c, d, k, s, Ti)\
+  t = a + G(b,c,d) + X[k] + Ti;\
+  a = ROTATE_LEFT(t, s) + b
+     /* Do the following 16 operations. */
+    SET(a, b, c, d,  1,  5, T17);
+    SET(d, a, b, c,  6,  9, T18);
+    SET(c, d, a, b, 11, 14, T19);
+    SET(b, c, d, a,  0, 20, T20);
+    SET(a, b, c, d,  5,  5, T21);
+    SET(d, a, b, c, 10,  9, T22);
+    SET(c, d, a, b, 15, 14, T23);
+    SET(b, c, d, a,  4, 20, T24);
+    SET(a, b, c, d,  9,  5, T25);
+    SET(d, a, b, c, 14,  9, T26);
+    SET(c, d, a, b,  3, 14, T27);
+    SET(b, c, d, a,  8, 20, T28);
+    SET(a, b, c, d, 13,  5, T29);
+    SET(d, a, b, c,  2,  9, T30);
+    SET(c, d, a, b,  7, 14, T31);
+    SET(b, c, d, a, 12, 20, T32);
+#undef SET
+
+     /* Round 3. */
+     /* Let [abcd k s t] denote the operation
+          a = b + ((a + H(b,c,d) + X[k] + T[i]) <<< s). */
+#define H(x, y, z) ((x) ^ (y) ^ (z))
+#define SET(a, b, c, d, k, s, Ti)\
+  t = a + H(b,c,d) + X[k] + Ti;\
+  a = ROTATE_LEFT(t, s) + b
+     /* Do the following 16 operations. */
+    SET(a, b, c, d,  5,  4, T33);
+    SET(d, a, b, c,  8, 11, T34);
+    SET(c, d, a, b, 11, 16, T35);
+    SET(b, c, d, a, 14, 23, T36);
+    SET(a, b, c, d,  1,  4, T37);
+    SET(d, a, b, c,  4, 11, T38);
+    SET(c, d, a, b,  7, 16, T39);
+    SET(b, c, d, a, 10, 23, T40);
+    SET(a, b, c, d, 13,  4, T41);
+    SET(d, a, b, c,  0, 11, T42);
+    SET(c, d, a, b,  3, 16, T43);
+    SET(b, c, d, a,  6, 23, T44);
+    SET(a, b, c, d,  9,  4, T45);
+    SET(d, a, b, c, 12, 11, T46);
+    SET(c, d, a, b, 15, 16, T47);
+    SET(b, c, d, a,  2, 23, T48);
+#undef SET
+
+     /* Round 4. */
+     /* Let [abcd k s t] denote the operation
+          a = b + ((a + I(b,c,d) + X[k] + T[i]) <<< s). */
+#define I(x, y, z) ((y) ^ ((x) | ~(z)))
+#define SET(a, b, c, d, k, s, Ti)\
+  t = a + I(b,c,d) + X[k] + Ti;\
+  a = ROTATE_LEFT(t, s) + b
+     /* Do the following 16 operations. */
+    SET(a, b, c, d,  0,  6, T49);
+    SET(d, a, b, c,  7, 10, T50);
+    SET(c, d, a, b, 14, 15, T51);
+    SET(b, c, d, a,  5, 21, T52);
+    SET(a, b, c, d, 12,  6, T53);
+    SET(d, a, b, c,  3, 10, T54);
+    SET(c, d, a, b, 10, 15, T55);
+    SET(b, c, d, a,  1, 21, T56);
+    SET(a, b, c, d,  8,  6, T57);
+    SET(d, a, b, c, 15, 10, T58);
+    SET(c, d, a, b,  6, 15, T59);
+    SET(b, c, d, a, 13, 21, T60);
+    SET(a, b, c, d,  4,  6, T61);
+    SET(d, a, b, c, 11, 10, T62);
+    SET(c, d, a, b,  2, 15, T63);
+    SET(b, c, d, a,  9, 21, T64);
+#undef SET
+
+     /* Then perform the following additions. (That is increment each
+        of the four registers by the value it had before this block
+        was started.) */
+    pms->abcd[0] += a;
+    pms->abcd[1] += b;
+    pms->abcd[2] += c;
+    pms->abcd[3] += d;
+}
+
+void
+md5_init(md5_state_t *pms)
+{
+    pms->count[0] = pms->count[1] = 0;
+    pms->abcd[0] = 0x67452301;
+    pms->abcd[1] = 0xefcdab89;
+    pms->abcd[2] = 0x98badcfe;
+    pms->abcd[3] = 0x10325476;
+}
+
+void
+md5_append(md5_state_t *pms, const md5_byte_t *data, int nbytes)
+{
+    const md5_byte_t *p = data;
+    int left = nbytes;
+    int offset = (pms->count[0] >> 3) & 63;
+    md5_word_t nbits = (md5_word_t)(nbytes << 3);
+
+    if (nbytes <= 0)
+	return;
+
+    /* Update the message length. */
+    pms->count[1] += nbytes >> 29;
+    pms->count[0] += nbits;
+    if (pms->count[0] < nbits)
+	pms->count[1]++;
+
+    /* Process an initial partial block. */
+    if (offset) {
+	int copy = (offset + nbytes > 64 ? 64 - offset : nbytes);
+
+	memcpy(pms->buf + offset, p, copy);
+	if (offset + copy < 64)
+	    return;
+	p += copy;
+	left -= copy;
+	md5_process(pms, pms->buf);
+    }
+
+    /* Process full blocks. */
+    for (; left >= 64; p += 64, left -= 64)
+	md5_process(pms, p);
+
+    /* Process a final partial block. */
+    if (left)
+	memcpy(pms->buf, p, left);
+}
+
+void
+md5_finish(md5_state_t *pms, md5_byte_t digest[16])
+{
+    static const md5_byte_t pad[64] = {
+	0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+    };
+    md5_byte_t data[8];
+    int i;
+
+    /* Save the length before padding. */
+    for (i = 0; i < 8; ++i)
+	data[i] = (md5_byte_t)(pms->count[i >> 2] >> ((i & 3) << 3));
+    /* Pad to 56 bytes mod 64. */
+    md5_append(pms, pad, ((55 - (pms->count[0] >> 3)) & 63) + 1);
+    /* Append the length. */
+    md5_append(pms, data, 8);
+    for (i = 0; i < 16; ++i)
+	digest[i] = (md5_byte_t)(pms->abcd[i >> 2] >> ((i & 3) << 3));
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libfaim/md5.h	Tue Aug 22 23:38:47 2000 +0000
@@ -0,0 +1,94 @@
+/*
+  Copyright (C) 1999 Aladdin Enterprises.  All rights reserved.
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  L. Peter Deutsch
+  ghost@aladdin.com
+
+ */
+/*$Id: md5.h 751 2000-08-22 23:38:47Z warmenhoven $ */
+/*
+  Independent implementation of MD5 (RFC 1321).
+
+  This code implements the MD5 Algorithm defined in RFC 1321.
+  It is derived directly from the text of the RFC and not from the
+  reference implementation.
+
+  The original and principal author of md5.h is L. Peter Deutsch
+  <ghost@aladdin.com>.  Other authors are noted in the change history
+  that follows (in reverse chronological order):
+
+  1999-11-04 lpd Edited comments slightly for automatic TOC extraction.
+  1999-10-18 lpd Fixed typo in header comment (ansi2knr rather than md5);
+	added conditionalization for C++ compilation from Martin
+	Purschke <purschke@bnl.gov>.
+  1999-05-03 lpd Original version.
+ */
+
+#ifndef md5_INCLUDED
+#  define md5_INCLUDED
+
+/*
+ * This code has some adaptations for the Ghostscript environment, but it
+ * will compile and run correctly in any environment with 8-bit chars and
+ * 32-bit ints.  Specifically, it assumes that if the following are
+ * defined, they have the same meaning as in Ghostscript: P1, P2, P3,
+ * ARCH_IS_BIG_ENDIAN.
+ */
+
+typedef unsigned char md5_byte_t; /* 8-bit byte */
+typedef unsigned int md5_word_t; /* 32-bit word */
+
+/* Define the state of the MD5 Algorithm. */
+typedef struct md5_state_s {
+    md5_word_t count[2];	/* message length in bits, lsw first */
+    md5_word_t abcd[4];		/* digest buffer */
+    md5_byte_t buf[64];		/* accumulate block */
+} md5_state_t;
+
+#ifdef __cplusplus
+extern "C" 
+{
+#endif
+
+/* Initialize the algorithm. */
+#ifdef P1
+void md5_init(P1(md5_state_t *pms));
+#else
+void md5_init(md5_state_t *pms);
+#endif
+
+/* Append a string to the message. */
+#ifdef P3
+void md5_append(P3(md5_state_t *pms, const md5_byte_t *data, int nbytes));
+#else
+void md5_append(md5_state_t *pms, const md5_byte_t *data, int nbytes);
+#endif
+
+/* Finish the message and return the digest. */
+#ifdef P2
+void md5_finish(P2(md5_state_t *pms, md5_byte_t digest[16]));
+#else
+void md5_finish(md5_state_t *pms, md5_byte_t digest[16]);
+#endif
+
+#ifdef __cplusplus
+}  /* end extern "C" */
+#endif
+
+#endif /* md5_INCLUDED */
--- a/src/conversation.c	Tue Aug 22 19:23:36 2000 +0000
+++ b/src/conversation.c	Tue Aug 22 23:38:47 2000 +0000
@@ -1091,12 +1091,22 @@
 	int colorv = -1;
 	char *clr;
 	char *smiley = g_malloc(7);
+	struct buddy *b;
 
 	if (!who) {
 		if (flags & WFLAG_SEND)
 			who = current_user->username;
-		else
-			who = c->name;
+		else {
+			b = find_buddy(c->name);
+			if (b)
+				who = b->show;
+			else
+				who = c->name;
+		}
+	} else {
+		b = find_buddy(who);
+		if (b)
+			who = b->show;
 	}
 	
         if (flags & WFLAG_SYSTEM) {
--- a/src/oscar.c	Tue Aug 22 19:23:36 2000 +0000
+++ b/src/oscar.c	Tue Aug 22 23:38:47 2000 +0000
@@ -72,6 +72,7 @@
 
 static int gaim_parse_auth_resp  (struct aim_session_t *, struct command_rx_struct *, ...);
 static int gaim_auth_server_ready(struct aim_session_t *, struct command_rx_struct *, ...);
+static int gaim_parse_login      (struct aim_session_t *, struct command_rx_struct *, ...);
 static int gaim_server_ready     (struct aim_session_t *, struct command_rx_struct *, ...);
 static int gaim_handle_redirect  (struct aim_session_t *, struct command_rx_struct *, ...);
 static int gaim_parse_oncoming   (struct aim_session_t *, struct command_rx_struct *, ...);
@@ -148,7 +149,7 @@
 int oscar_login(char *username, char *password) {
 	struct aim_session_t *sess;
 	struct aim_conn_t *conn;
-	struct client_info_s info = {"AOL Instant Messenger (TM), version 2.1.1187/WIN32", 4, 30, 3141, "us", "en", 0x0004, 0x0001, 0x055};
+/*	struct client_info_s info = {"AOL Instant Messenger (TM), version 2.1.1187/WIN32", 4, 30, 3141, "us", "en", 0x0004, 0x0001, 0x055}; */
 	struct aim_user *u;
 	char buf[256];
 
@@ -193,6 +194,11 @@
 	g_snprintf(buf, sizeof(buf), _("Signon: %s"), username);
 	set_login_progress(2, buf);
 
+	aim_conn_addhandler(sess, conn, 0x0017, 0x0007, gaim_parse_login, 0);
+	aim_conn_addhandler(sess, conn, 0x0017, 0x0003, gaim_parse_auth_resp, 0);
+	aim_sendconnack(sess, conn);
+	aim_request_login(sess, conn, username);
+/*
 	aim_conn_addhandler(sess, conn, AIM_CB_FAM_SPECIAL,
 				AIM_CB_SPECIAL_AUTHSUCCESS,
 				gaim_parse_auth_resp, 0);
@@ -200,6 +206,7 @@
 				AIM_CB_GEN_SERVERREADY,
 				gaim_auth_server_ready, 0);
 	aim_send_login(sess, conn, username, password, &info);
+*/
 
 	inpa = gdk_input_add(conn->fd, GDK_INPUT_READ | GDK_INPUT_EXCEPTION,
 			oscar_callback, conn);
@@ -347,6 +354,20 @@
 	return 1;
 }
 
+int gaim_parse_login(struct aim_session_t *sess,
+		     struct command_rx_struct *command, ...) {
+	struct client_info_s info = {"AOL Instant Messenger (TM), version 2.1.1187/WIN32", 4, 30, 3141, "us", "en", 0x0004, 0x0001, 0x055};
+	unsigned char *key;
+	va_list ap;
+
+	va_start(ap, command);
+	key = va_arg(ap, char *);
+	va_end(ap);
+
+	aim_send_login(sess, command->conn,
+			current_user->username, current_user->password, &info, key);
+}
+
 int gaim_server_ready(struct aim_session_t *sess,
 		      struct command_rx_struct *command, ...) {
 	static int id = 1;