Changeset ef9ee0e

Timestamp:

2015-05-31T02:40:05Z (9 years ago)

Author:

dequis <dx@…>

Children:

899c8e8

Parents:

4107fea

git-author:

dequis <dx@…> (19-04-15 06:06:25)

git-committer:

dequis <dx@…> (31-05-15 02:40:05)

Message:

msn: reply BND with PUT MSGR\CHALLENGE

Still the same challenge functions as msnp11

Location:

protocols/msn

Files:

• msn.h (modified) (3 diffs)
• ns.c (modified) (3 diffs)

protocols/msn/msn.h

@@ -27 +27 @@
 #define _MSN_H
 
-/* This should be MSN Messenger 7.0.0813
-#define MSNP11_PROD_KEY "CFHUR$52U_{VIX5T"
-#define MSNP11_PROD_ID  "PROD0101{0RM?UBW"
-*/
-
 #define MSN_SSL_HOST "s.gateway.messenger.live.com"
 #define MSN_SSL_PORT 443
@@ -38 +33 @@
 #define MSN_HTTP_PORT 443
 
-/* Some other version.
-#define MSNP11_PROD_KEY "O4BG@C7BWLYQX?5G"
-#define MSNP11_PROD_ID  "PROD01065C%ZFN6F"
-*/
-
-/* <= BitlBee 3.0.5
-#define MSNP11_PROD_KEY "ILTXC!4IXB5FB*PX"
-#define MSNP11_PROD_ID  "PROD0119GSJUC$18"
-*/
-
-#define MSNP11_PROD_KEY "C1BX{V4W}Q3*10SM"
-#define MSNP11_PROD_ID  "PROD0120PW!CCV9@"
-#define MSNP_VER        "MSNP21"
-#define MSNP_BUILD      "14.0.8117.416"
-
-#define MSN_SB_NEW         -24062002
+#define MSNP11_PROD_KEY "YMM8C_H7KCQ2S_KL"
+#define MSNP11_PROD_ID  "PROD0090YUAUV{2B"
 
 #define MSN_CAP1        0xC000
@@ -102 +83 @@
         MSN_REAUTHING = 8,
         MSN_EMAIL_UNVERIFIED = 16,
+        MSN_DONE_BND = 32,
 } msn_flags_t;
 

protocols/msn/ns.c

@@ -252 +252 @@
                 char *payload;
 
+                if (md->flags & MSN_DONE_BND) {
+                        return 1;
+                }
+
+                md->flags |= MSN_DONE_BND;
+
+                // BND
                 payload = g_markup_printf_escaped(
                         "<msgr><ver>1</ver><client><name>Skype</name><ver>2/4.3.0.37/174</ver></client>"
@@ -262 +269 @@
 
         } else if (strcmp(cmd[0], "BND") == 0) {
+                struct xt_node *node;
+                char *nonce, *resp, *payload;
+
+                if (!(xml = xt_from_string(msg + 2, msglen - 2)) ||
+                    !(node = xt_find_node(xml->children, "nonce")) ||
+                    !(nonce = node->text)) {
+                        return 1;
+                }
+
+                resp = msn_p11_challenge(nonce);
+
+                // PUT MSGR\CHALLENGE
+                payload = g_markup_printf_escaped(
+                        "<challenge><appId>%s</appId><response>%s</response></challenge>",
+                        MSNP11_PROD_ID, resp);
+
+                msn_ns_write_cmd(ic, "PUT", "MSGR\\CHALLENGE", payload);
+
                 imcb_log(ic, "Authenticated, getting buddy list");
                 msn_soap_memlist_request(ic);
+
+                xt_free_node(xml);
+                g_free(payload);
+                g_free(resp);
 
         } else if (strcmp(cmd[0], "ADL") == 0) {
@@ -270 +299 @@
                         return msn_ns_finish_login(ic);
                 }
-        } else if (strcmp(cmd[0], "CHL") == 0) {
-                char *resp;
-                int st;
-
-                if (num_parts < 3) {
-                        imcb_error(ic, "Syntax error");
-                        imc_logout(ic, TRUE);
-                        return(0);
-                }
-
-                resp = msn_p11_challenge(cmd[2]);
-
-                st =  msn_ns_write(ic, "QRY %d %s %zd\r\n%s",
-                                   ++md->trId, MSNP11_PROD_ID,
-                                   strlen(resp), resp);
-                g_free(resp);
-                return st;
-        } else if (strcmp(cmd[0], "QRY") == 0) {
-                /* CONGRATULATIONS */
         } else if (strcmp(cmd[0], "OUT") == 0) {
                 imcb_error(ic, "Session terminated by remote server (%s)", cmd[1] ? cmd[1] : "reason unknown");