- Thu May 10 17:37:23 PDT 2001

  - I haven't had lunch yet.  What should I have?

 - Wed May  9 15:21:51 PDT 2001
  - I had pizza for lunch.

diff --git a/CHANGES b/CHANGES
index 871755519c60ef8f5b41755f5aa9e17b351338f8..b7a35bbf5fff6e282433a5d28871bb523d28c1c3 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
 
 No release numbers
 ------------------
+ - Thu May 10 17:37:23 PDT 2001
+  - I haven't had lunch yet.  What should I have?
+
  - Wed May  9 15:21:51 PDT 2001
   - I had pizza for lunch.
 

diff --git a/src/login.c b/src/login.c
index 1687f4b7e4f93c3116ae57fd4d8bae99c88dc288..987c66a7b787cb449517a0f747614ad8391b53a9 100644 (file)
--- a/src/login.c
+++ b/src/login.c
@@ -813,19 +813,17 @@ faim_export int aim_sendmemblock(struct aim_session_t *sess, struct aim_conn_t *
       faimdprintf(sess, 0, "sendmemblock: WARNING: sending bad hash... you will be disconnected soon...\n");
 
     /* 
-     * This data is correct for AIM 3.5.1670, offset 0x1000, length 0 
+     * This data is correct for AIM 3.5.1670, offset 0x03ffffff, 
+     * length 0x03ffffff (invalid).
      *
      * Using this block is as close to "legal" as you can get without
      * using an AIM binary.
      *
-     * For the moment, this is the MD5 hash of nothing.  Yes, that's
-     * right.  Nothing.  AOL is smart.
-     *
      */
-    i += aimutil_put32(tx->data+i, 0xd41d8cd9);
-    i += aimutil_put32(tx->data+i, 0x8f00b204);
-    i += aimutil_put32(tx->data+i, 0xe9800998);
-    i += aimutil_put32(tx->data+i, 0xecf8427e);
+    i += aimutil_put32(tx->data+i, 0x1df8cbae);
+    i += aimutil_put32(tx->data+i, 0x5523b839);
+    i += aimutil_put32(tx->data+i, 0xa0e10db3);
+    i += aimutil_put32(tx->data+i, 0xa46d3b39);
 
   }
 

diff --git a/utils/faimtest/faimtest.c b/utils/faimtest/faimtest.c
index 4c8db38afd8ce2984b58a0c5b2d1144d8ca6ca7e..b294ca90165c28bd4dc095d22bdf1c73aa3f9e5e 100644 (file)
--- a/utils/faimtest/faimtest.c
+++ b/utils/faimtest/faimtest.c
@@ -828,7 +828,7 @@ static int getaimdata(unsigned char **bufret, int *buflenret, unsigned long offs
   unsigned char *buf;
   int invalid = 0;
 
-  if (!bufret || !*bufret || !buflenret)
+  if (!bufret || !buflenret)
     return -1;
 
   if (modname) {
@@ -857,7 +857,7 @@ static int getaimdata(unsigned char **bufret, int *buflenret, unsigned long offs
     return -1;
   }
 
-  if ((offset > st.st_size) || (offset > st.st_size))
+  if ((offset > st.st_size) || (len > st.st_size))
     invalid = 1;
   else if ((st.st_size - offset) < len)
     len = st.st_size - offset;