From 5daacaa384bc7b77255078b512634a407708fe2e Mon Sep 17 00:00:00 2001 From: mid Date: Wed, 8 Nov 2000 13:19:10 +0000 Subject: [PATCH] - Wed Nov 8 13:11:18 UTC 2000 - Reenable/reimplement older login, but only use for ICQ UINs - This is a fairly ugly hack. But...eh. It works. - You'll need to remove the aim_sendconnack() before the call to aim_request_login. It will now do it automatically if its needed. (hint: ***CLIENT CHANGE***) --- CHANGES | 7 ++ aim_conn.c | 1 + aim_login.c | 136 ++++++++++++++++++++++++++++++-------- aim_rxhandlers.c | 9 +-- faim/aim.h | 2 + utils/faimtest/faimtest.c | 2 +- 6 files changed, 124 insertions(+), 33 deletions(-) diff --git a/CHANGES b/CHANGES index 008ebaf..7b0f3d1 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,13 @@ No release numbers ------------------ + - Wed Nov 8 13:11:18 UTC 2000 + - Reenable/reimplement older login, but only use for ICQ UINs + - This is a fairly ugly hack. But...eh. It works. + - You'll need to remove the aim_sendconnack() before the + call to aim_request_login. It will now do it automatically + if its needed. (hint: ***CLIENT CHANGE***) + - Wed Nov 8 02:23:25 UTC 2000 - I'm trying out using a modified version of the kernel-doc scripts to help document the libfaim code a bit. See aim_conn.c and diff --git a/aim_conn.c b/aim_conn.c index 5009627..ca42aea 100644 --- a/aim_conn.c +++ b/aim_conn.c @@ -685,6 +685,7 @@ faim_export void aim_session_init(struct aim_session_t *sess) sess->pendingjoin = NULL; aim_initsnachash(sess); sess->snac_nextid = 0x00000001; + sess->snaclogin = 1; /* default to yes, oh gods yes. */ /* * This must always be set. Default to the queue-based diff --git a/aim_login.c b/aim_login.c index 4420256..49cf7f8 100644 --- a/aim_login.c +++ b/aim_login.c @@ -10,6 +10,7 @@ #include "md5.h" static int aim_encode_password_md5(const char *password, const char *key, md5_byte_t *digest); +static int aim_encode_password(const char *password, unsigned char *encoded); /* * FIXME: Reimplement the TIS stuff. @@ -49,19 +50,75 @@ faim_export int aim_request_login(struct aim_session_t *sess, struct aim_conn_t *conn, char *sn) { - int curbyte=0; - + int curbyte; struct command_tx_struct *newpacket; + if (!sess || !conn || !sn) + return -1; + + /* + * For ICQ, we enable the ancient horrible login and stuff + * a key packet into the queue to make it look like we got + * a reply back. This is so the client doesn't know we're + * really not doing MD5 login. + * + * This may sound stupid, but I'm not in the best of moods and + * I don't plan to keep support for this crap around much longer. + * Its all AOL's fault anyway, really. I hate AOL. Really. They + * always seem to be able to piss me off by doing the dumbest little + * things. Like disabling MD5 logins for ICQ UINs, or adding purposefully + * wrong TLV lengths, or adding superfluous information to host strings, + * or... I'll stop. + * + */ + if ((sn[0] >= '0') && (sn[0] <= '9')) { + struct command_rx_struct *newrx; + int i; + + if (!(newrx = (struct command_rx_struct *)malloc(sizeof(struct command_rx_struct)))) + return -1; + memset(newrx, 0x00, sizeof(struct command_rx_struct)); + newrx->lock = 1; + newrx->hdrtype = AIM_FRAMETYPE_OSCAR; + newrx->hdr.oscar.type = 0x02; + newrx->hdr.oscar.seqnum = 0; + newrx->commandlen = 10+2+1; + newrx->nofree = 0; + if (!(newrx->data = malloc(newrx->commandlen))) { + free(newrx); + return -1; + } + + i = aim_putsnac(newrx->data, 0x0017, 0x0007, 0x0000, 0x0000); + i += aimutil_put16(newrx->data+i, 0x01); + i += aimutil_putstr(newrx->data+i, "0", 1); + + newrx->conn = conn; + + newrx->next = sess->queue_incoming; + sess->queue_incoming = newrx; + + newrx->lock = 0; + + sess->snaclogin = 0; + return 0; + } + + sess->snaclogin = 1; + + aim_sendconnack(sess, conn); + if (!(newpacket = aim_tx_new(AIM_FRAMETYPE_OSCAR, 0x0002, conn, 10+2+2+strlen(sn)))) return -1; newpacket->lock = 1; - curbyte += aim_putsnac(newpacket->data+curbyte, 0x0017, 0x0006, 0x0000, 0x00010000); + curbyte = aim_putsnac(newpacket->data, 0x0017, 0x0006, 0x0000, 0x00010000); curbyte += aim_puttlv_str(newpacket->data+curbyte, 0x0001, strlen(sn), sn); + newpacket->commandlen = curbyte; newpacket->lock = 0; + return aim_tx_enqueue(sess, newpacket); } @@ -82,8 +139,6 @@ faim_export int aim_send_login (struct aim_session_t *sess, char *key) { int curbyte=0; - md5_byte_t digest[16]; - struct command_tx_struct *newpacket; if (!clientinfo || !sn || !password) @@ -94,27 +149,52 @@ faim_export int aim_send_login (struct aim_session_t *sess, newpacket->lock = 1; - newpacket->hdr.oscar.type = 0x02; + newpacket->hdr.oscar.type = sess->snaclogin?0x02:0x01; - curbyte = aim_putsnac(newpacket->data+curbyte, 0x0017, 0x0002, 0x0000, 0x00010000); + if (sess->snaclogin) + curbyte = aim_putsnac(newpacket->data, 0x0017, 0x0002, 0x0000, 0x00010000); + else { + curbyte = aimutil_put16(newpacket->data, 0x0000); + curbyte += aimutil_put16(newpacket->data+curbyte, 0x0001); + } - curbyte+= aim_puttlv_str(newpacket->data+curbyte, 0x0001, strlen(sn), sn); - - aim_encode_password_md5(password, key, digest); - curbyte+= aim_puttlv_str(newpacket->data+curbyte, 0x0025, 16, (char *)digest); + curbyte += aim_puttlv_str(newpacket->data+curbyte, 0x0001, strlen(sn), sn); + if (sess->snaclogin) { + md5_byte_t digest[16]; + + aim_encode_password_md5(password, key, digest); + curbyte+= aim_puttlv_str(newpacket->data+curbyte, 0x0025, 16, (char *)digest); + } else { + char *password_encoded; + + 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); + } + /* XXX is clientstring required by oscar? */ if (strlen(clientinfo->clientstring)) curbyte += aim_puttlv_str(newpacket->data+curbyte, 0x0003, strlen(clientinfo->clientstring), clientinfo->clientstring); - curbyte += aim_puttlv_16(newpacket->data+curbyte, 0x0016, (unsigned short)clientinfo->major2); - curbyte += aim_puttlv_16(newpacket->data+curbyte, 0x0017, (unsigned short)clientinfo->major); - curbyte += aim_puttlv_16(newpacket->data+curbyte, 0x0018, (unsigned short)clientinfo->minor); - curbyte += aim_puttlv_16(newpacket->data+curbyte, 0x0019, (unsigned short)clientinfo->minor2); - curbyte += aim_puttlv_16(newpacket->data+curbyte, 0x001a, (unsigned short)clientinfo->build); + if (sess->snaclogin) { + curbyte += aim_puttlv_16(newpacket->data+curbyte, 0x0016, (unsigned short)clientinfo->major2); + curbyte += aim_puttlv_16(newpacket->data+curbyte, 0x0017, (unsigned short)clientinfo->major); + curbyte += aim_puttlv_16(newpacket->data+curbyte, 0x0018, (unsigned short)clientinfo->minor); + curbyte += aim_puttlv_16(newpacket->data+curbyte, 0x0019, (unsigned short)clientinfo->minor2); + curbyte += aim_puttlv_16(newpacket->data+curbyte, 0x001a, (unsigned short)clientinfo->build); - curbyte += aim_puttlv_32(newpacket->data+curbyte, 0x0014, clientinfo->unknown); - curbyte += aim_puttlv_16(newpacket->data+curbyte, 0x0009, 0x0015); + curbyte += aim_puttlv_32(newpacket->data+curbyte, 0x0014, clientinfo->unknown); + curbyte += aim_puttlv_16(newpacket->data+curbyte, 0x0009, 0x0015); + } else { + curbyte += aim_puttlv_16(newpacket->data+curbyte, 0x0016, 0x010a); + curbyte += aim_puttlv_16(newpacket->data+curbyte, 0x0017, 0x0004); + curbyte += aim_puttlv_16(newpacket->data+curbyte, 0x0018, 0x003c); + curbyte += aim_puttlv_16(newpacket->data+curbyte, 0x0019, 0x0001); + curbyte += aim_puttlv_16(newpacket->data+curbyte, 0x001a, 0x0cce); + curbyte += aim_puttlv_32(newpacket->data+curbyte, 0x0014, 0x00000055); + } if (strlen(clientinfo->country)) curbyte += aim_puttlv_str(newpacket->data+curbyte, 0x000e, strlen(clientinfo->country), clientinfo->country); @@ -145,25 +225,23 @@ static int aim_encode_password_md5(const char *password, const char *key, md5_by return 0; } -/* - * int encode_password( - * const char *password, - * char *encoded - * ); +/** + * aim_encode_password - Encode a password using old XOR method + * @password: incoming password + * @encoded: buffer to put encoded password * * This takes a const pointer to a (null terminated) string * containing the unencoded password. It also gets passed * an already allocated buffer to store the encoded password. * This buffer should be the exact length of the password without - * the null. The encoded password buffer IS NOT NULL TERMINATED. + * the null. The encoded password buffer /is not %NULL terminated/. * * 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. + * This is only used for the XOR method, not the better MD5 method. * */ -#if 0 static int aim_encode_password(const char *password, unsigned char *encoded) { u_char encoding_table[] = { @@ -187,7 +265,6 @@ static int aim_encode_password(const char *password, unsigned char *encoded) return 0; } -#endif /* * This is sent back as a general response to the login command. @@ -215,7 +292,10 @@ faim_internal int aim_authparse(struct aim_session_t *sess, * For SNAC login, there's a 17/3 SNAC header in front. * */ - tlvlist = aim_readtlvchain(command->data+10, command->commandlen-10); + if (sess->snaclogin) + tlvlist = aim_readtlvchain(command->data+10, command->commandlen-10); + else + tlvlist = aim_readtlvchain(command->data, command->commandlen); /* * No matter what, we should have a screen name. diff --git a/aim_rxhandlers.c b/aim_rxhandlers.c index 4f5cf74..220394f 100644 --- a/aim_rxhandlers.c +++ b/aim_rxhandlers.c @@ -343,16 +343,17 @@ faim_export int aim_rxdispatch(struct aim_session_t *sess) workingPtr->handled = 1; break; case AIM_CONN_TYPE_AUTH: { - u_long head; + unsigned long head; head = aimutil_get32(workingPtr->data); - if (head == 0x00000001) { + if ((head == 0x00000001) && (workingPtr->commandlen == 4)) { faimdprintf(1, "got connection ack on auth line\n"); workingPtr->handled = 1; - } else if (workingPtr->hdr.oscar.type == 0x0004) { + } else if (workingPtr->hdr.oscar.type == 0x04) { + /* Used only by the older login protocol */ workingPtr->handled = aim_authparse(sess, workingPtr); } else { - u_short family,subtype; + unsigned short family,subtype; family = aimutil_get16(workingPtr->data); subtype = aimutil_get16(workingPtr->data+2); diff --git a/faim/aim.h b/faim/aim.h index dd0154c..645b06b 100644 --- a/faim/aim.h +++ b/faim/aim.h @@ -350,6 +350,8 @@ struct aim_session_t { char password[128]; } socksproxy; + int snaclogin; + struct aim_msgcookie_t *msgcookies; }; diff --git a/utils/faimtest/faimtest.c b/utils/faimtest/faimtest.c index 02ca0e0..cfd6c64 100644 --- a/utils/faimtest/faimtest.c +++ b/utils/faimtest/faimtest.c @@ -224,7 +224,7 @@ int main(void) aim_conn_addhandler(&aimsess, authconn, 0x0017, 0x0007, faimtest_parse_login, 0); aim_conn_addhandler(&aimsess, authconn, 0x0017, 0x0003, faimtest_parse_authresp, 0); - aim_sendconnack(&aimsess, authconn); + /* do NOT send a connack/flapversion, request_login will send it if needed */ aim_request_login(&aimsess, authconn, screenname); aim_conn_addhandler(&aimsess, authconn, AIM_CB_FAM_SPECIAL, AIM_CB_SPECIAL_DEBUGCONN_CONNECT, faimtest_debugconn_connect, 0); -- 2.45.1