Changeset 2528cda

Timestamp:

2010-08-08T15:34:49Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

5fecede

Parents:

b890626 (diff), ee6cc94 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merging msn-offline branch. A tiny bit of MSNP13, and it works for the first
minute of the session (after that the MSN server finds out the rest of
BitlBee still speaks MSNP8).

Files:

• lib/misc.c (modified) (2 diffs)
• protocols/msn/Makefile (modified) (1 diff)
• protocols/msn/msn.c (modified) (1 diff)
• protocols/msn/msn.h (modified) (4 diffs)
• protocols/msn/msn_util.c (modified) (3 diffs)
• protocols/msn/ns.c (modified) (1 diff)
• protocols/msn/sb.c (modified) (2 diffs)
• protocols/msn/soap.c (added)
• protocols/msn/soap.h (added)

lib/misc.c

@@ -298 +298 @@
 void http_encode( char *s )
 {
-        char *t;
+        char t[strlen(s)+1];
         int i, j;
         
-        t = g_strdup( s );
-        
+        strcpy( t, s );
         for( i = j = 0; t[i]; i ++, j ++ )
         {
@@ -320 +319 @@
         }
         s[j] = 0;
-        
-        g_free( t );
 }
 

protocols/msn/Makefile

@@ -13 +13 @@
 
 # [SH] Program variables
-objects = msn.o msn_util.o ns.o passport.o sb.o tables.o
+objects = msn.o msn_util.o ns.o passport.o sb.o soap.o tables.o
 
 LFLAGS += -r

protocols/msn/msn.c

@@ -103 +103 @@
                         g_free( md->grouplist[--md->groupcount] );
                 g_free( md->grouplist );
+                g_free( md->passport_token );
+                g_free( md->lock_key );
                 
                 while( md->grpq )

protocols/msn/msn.h

@@ -2 +2 @@
   * BitlBee -- An IRC to other IM-networks gateway                     *
   *                                                                    *
-  * Copyright 2002-2004 Wilmer van der Gaast and others                *
+  * Copyright 2002-2010 Wilmer van der Gaast and others                *
   \********************************************************************/
 
@@ -42 +42 @@
 #define QRY_CODE "Q1P7W2E4J9R8U3S5"
 
+/* This should be MSN Messenger 7.0.0813 */
+//#define MSNP11_PROD_KEY "CFHUR$52U_{VIX5T"
+//#define MSNP11_PROD_ID  "PROD0101{0RM?UBW"
+
+#define MSNP11_PROD_KEY "O4BG@C7BWLYQX?5G"
+#define MSNP11_PROD_ID  "PROD01065C%ZFN6F"
+
 #define MSN_SB_NEW         -24062002
 
@@ -69 +76 @@
         
         int trId;
+        char *passport_token;
+        char *lock_key;
         
         GSList *msgq, *grpq;
@@ -175 +184 @@
 void msn_msgq_purge( struct im_connection *ic, GSList **list );
 gboolean msn_set_display_name( struct im_connection *ic, const char *rawname );
+char *msn_p11_challenge( char *challenge );
 
 /* tables.c */

protocols/msn/msn_util.c

@@ -2 +2 @@
   * BitlBee -- An IRC to other IM-networks gateway                     *
   *                                                                    *
-  * Copyright 2002-2004 Wilmer van der Gaast and others                *
+  * Copyright 2002-2010 Wilmer van der Gaast and others                *
   \********************************************************************/
 
@@ -26 +26 @@
 #include "nogaim.h"
 #include "msn.h"
+#include "md5.h"
 #include <ctype.h>
 
@@ -444 +445 @@
         return msn_write( ic, buf, strlen( buf ) ) != 0;
 }
+
+unsigned int little_endian( unsigned int dw )
+{
+#if defined(__BYTE_ORDER) && __BYTE_ORDER == __LITTLE_ENDIAN
+        return dw;
+#else
+        /* We're still not sure if this machine is big endian since the
+           constants above are not that portable. Don't swap bytes, just
+           force-compose a 32-bit little endian integer. */
+        unsigned int ret = 0, i;
+        char *dst = (char*) (&ret + 1);
+        
+        for (i = 0; i < 4; i ++)
+        {
+                *(--dst) = dw >> 24;
+                dw <<= 8;
+        }
+        
+        return ret;
+#endif
+}
+
+/* Copied and heavily modified from http://tmsnc.sourceforge.net/chl.c */
+char *msn_p11_challenge( char *challenge )
+{
+        char *output, buf[256];
+        md5_state_t md5c;
+        unsigned char md5Hash[16], *newHash;
+        unsigned int *md5Parts, *chlStringParts, newHashParts[5];
+        long long nHigh = 0, nLow = 0;
+        int i, n;
+
+        /* Create the MD5 hash */
+        md5_init(&md5c);
+        md5_append(&md5c, (unsigned char*) challenge, strlen(challenge));
+        md5_append(&md5c, (unsigned char*) MSNP11_PROD_KEY, strlen(MSNP11_PROD_KEY));
+        md5_finish(&md5c, md5Hash);
+
+        /* Split it into four integers */
+        md5Parts = (unsigned int *)md5Hash;
+        for (i = 0; i < 4; i ++)
+        {  
+                md5Parts[i] = little_endian(md5Parts[i]);
+                
+                /* & each integer with 0x7FFFFFFF */
+                /* and save one unmodified array for later */
+                newHashParts[i] = md5Parts[i];
+                md5Parts[i] &= 0x7FFFFFFF;
+        }
+        
+        /* make a new string and pad with '0' */
+        n = g_snprintf(buf, sizeof(buf)-5, "%s%s00000000", challenge, MSNP11_PROD_ID);
+        /* truncate at an 8-byte boundary */
+        buf[n&=~7] = '\0';
+        
+        /* split into integers */
+        chlStringParts = (unsigned int *)buf;
+        
+        /* this is magic */
+        for (i = 0; i < (n / 4) - 1; i += 2)
+        {
+                long long temp;
+
+                chlStringParts[i]   = little_endian(chlStringParts[i]);
+                chlStringParts[i+1] = little_endian(chlStringParts[i+1]);
+
+                temp  = (md5Parts[0] * (((0x0E79A9C1 * (long long)chlStringParts[i]) % 0x7FFFFFFF)+nHigh) + md5Parts[1])%0x7FFFFFFF;
+                nHigh = (md5Parts[2] * (((long long)chlStringParts[i+1]+temp) % 0x7FFFFFFF) + md5Parts[3]) % 0x7FFFFFFF;
+                nLow  = nLow + nHigh + temp;
+        }
+        nHigh = (nHigh+md5Parts[1]) % 0x7FFFFFFF;
+        nLow = (nLow+md5Parts[3]) % 0x7FFFFFFF;
+        
+        newHashParts[0] ^= nHigh;
+        newHashParts[1] ^= nLow;
+        newHashParts[2] ^= nHigh;
+        newHashParts[3] ^= nLow;
+        
+        /* swap more bytes if big endian */
+        for (i = 0; i < 4; i ++)
+                newHashParts[i] = little_endian(newHashParts[i]); 
+        
+        /* make a string of the parts */
+        newHash = (unsigned char *)newHashParts;
+        
+        /* convert to hexadecimal */
+        output = g_new(char, 33);
+        for (i = 0; i < 16; i ++)
+                sprintf(output + i * 2, "%02x", newHash[i]);
+        
+        return output;
+}

protocols/msn/ns.c

@@ -783 +783 @@
                 char buf[1024];
                 
+                md->passport_token = g_strdup( mad->token );
+                
                 g_snprintf( buf, sizeof( buf ), "USR %d TWN S %s\r\n", ++md->trId, mad->token );
                 msn_write( ic, buf, strlen( buf ) );

protocols/msn/sb.c

@@ -29 +29 @@
 #include "passport.h"
 #include "md5.h"
-#include "invitation.h"
+#include "soap.h"
 
 static gboolean msn_sb_callback( gpointer data, gint source, b_input_condition cond );
@@ -625 +625 @@
                 const struct msn_status_code *err = msn_status_by_number( num );
                 
-                imcb_error( ic, "Error reported by switchboard server: %s", err->text );
+                /* If the person is offline, send an offline message instead,
+                   and don't report an error. */
+                if( num == 217 )
+                        msn_soap_oim_send_queue( ic, &sb->msgq );
+                else
+                        imcb_error( ic, "Error reported by switchboard server: %s", err->text );
                 
                 if( err->flags & STATUS_SB_FATAL )