Changeset be7a180

Timestamp:

2010-08-12T22:38:30Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

b46769d

Parents:

ca7de3a

Message:

Proper responses to CHL challenges. Clean up bee_users before calling
prpl->logout() since the buddy_data functions would like some structs to
still exist.

Location:

protocols

Files:

• msn/msn.h (modified) (1 diff)
• msn/ns.c (modified) (2 diffs)
• nogaim.c (modified) (2 diffs)

protocols/msn/msn.h

@@ -39 +39 @@
 #endif
 
-#define QRY_NAME "msmsgs@msnmsgr.com"
-#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"
-
+/* This should be MSN Messenger 7.0.0813
+#define MSNP11_PROD_KEY "CFHUR$52U_{VIX5T"
+#define MSNP11_PROD_ID  "PROD0101{0RM?UBW"
+*/
+
+/* Some other version.
 #define MSNP11_PROD_KEY "O4BG@C7BWLYQX?5G"
 #define MSNP11_PROD_ID  "PROD01065C%ZFN6F"
+*/
+
+#define MSNP11_PROD_KEY "RG@XY*28Q5QHS%Q5"
+#define MSNP11_PROD_ID  "PROD0113H11T8$X_"
 
 #define MSN_SB_NEW         -24062002

protocols/msn/ns.c

@@ -293 +293 @@
         else if( strcmp( cmd[0], "CHL" ) == 0 )
         {
-                md5_state_t state;
-                md5_byte_t digest[16];
-                int i;
-                
-                if( num_parts != 3 )
-                {
-                        imcb_error( ic, "Syntax error" );
-                        imc_logout( ic, TRUE );
-                        return( 0 );
-                }
-                
-                md5_init( &state );
-                md5_append( &state, (const md5_byte_t *) cmd[2], strlen( cmd[2] ) );
-                md5_append( &state, (const md5_byte_t *) QRY_CODE, strlen( QRY_CODE ) );
-                md5_finish( &state, digest );
-                
-                g_snprintf( buf, sizeof( buf ), "QRY %d %s %d\r\n", ++md->trId, QRY_NAME, 32 );
-                for( i = 0; i < 16; i ++ )
-                        g_snprintf( buf + strlen( buf ), 3, "%02x", digest[i] );
+                char *resp;
+                
+                if( num_parts < 3 )
+                {
+                        imcb_error( ic, "Syntax error" );
+                        imc_logout( ic, TRUE );
+                        return( 0 );
+                }
+                
+                resp = msn_p11_challenge( cmd[2] );
+                g_snprintf( buf, sizeof( buf ), "QRY %d %s %zd\r\n%s",
+                            ++md->trId, MSNP11_PROD_ID,
+                            strlen( resp ), resp );
+                g_free( resp );
                 
                 return( msn_write( ic, buf, strlen( buf ) ) );
@@ -581 +576 @@
                    censore. Meh. */
                 md->handler->msglen = atoi( cmd[2] );
+        }
+        else if( strcmp( cmd[0], "UBX" ) == 0 )
+        {
+                /* Status message. Parser coming soon. */
+                if( num_parts >= 4 )
+                        md->handler->msglen = atoi( cmd[3] );
         }
         else if( isdigit( cmd[0][0] ) )

protocols/nogaim.c

@@ -326 +326 @@
         imcb_log( ic, "Signing off.." );
         
-        b_event_remove( ic->keepalive );
-        ic->keepalive = 0;
-        ic->acc->prpl->logout( ic );
-        b_event_remove( ic->inpa );
-        
-        g_free( ic->away );
-        ic->away = NULL;
-        
         for( l = bee->users; l; )
         {
@@ -344 +336 @@
                 l = next;
         }
+        
+        b_event_remove( ic->keepalive );
+        ic->keepalive = 0;
+        ic->acc->prpl->logout( ic );
+        b_event_remove( ic->inpa );
+        
+        g_free( ic->away );
+        ic->away = NULL;
         
         query_del_by_conn( (irc_t*) ic->bee->ui_data, ic );