X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=pppd%2Fchap_ms.c;h=9a87122f3451e6de051cbe0f3e0818b502b4cbd7;hb=6849615c460f11e9c267059af5dbe93813fbe456;hp=a489cc0d111aae8d61af1aed4432b06ddd5ce574;hpb=71d3de90eae52087b405e962ca650b71cec79c67;p=ppp.git diff --git a/pppd/chap_ms.c b/pppd/chap_ms.c index a489cc0..9a87122 100644 --- a/pppd/chap_ms.c +++ b/pppd/chap_ms.c @@ -74,7 +74,7 @@ * */ -#define RCSID "$Id: chap_ms.c,v 1.29 2003/06/11 23:56:26 paulus Exp $" +#define RCSID "$Id: chap_ms.c,v 1.33 2004/11/12 09:57:43 paulus Exp $" #ifdef CHAPMS @@ -97,16 +97,15 @@ static const char rcsid[] = RCSID; -static void ChallengeHash __P((u_char[16], u_char *, char *, u_char[8])); static void ascii2unicode __P((char[], int, u_char[])); static void NTPasswordHash __P((char *, int, u_char[MD4_SIGNATURE_SIZE])); static void ChallengeResponse __P((u_char *, u_char *, u_char[24])); static void ChapMS_NT __P((u_char *, char *, int, u_char[24])); static void ChapMS2_NT __P((char *, u_char[16], char *, char *, int, u_char[24])); -static void GenerateAuthenticatorResponse __P((char*, int, u_char[24], - u_char[16], u_char *, - char *, u_char[41])); +static void GenerateAuthenticatorResponsePlain + __P((char*, int, u_char[24], u_char[16], u_char *, + char *, u_char[41])); #ifdef MSLANMAN static void ChapMS_LANMan __P((u_char *, char *, int, MS_ChapResponse *)); #endif @@ -126,11 +125,13 @@ u_char mppe_send_key[MPPE_MAX_KEY_LEN]; u_char mppe_recv_key[MPPE_MAX_KEY_LEN]; int mppe_keys_set = 0; /* Have the MPPE keys been set? */ +#ifdef DEBUGMPPEKEY /* For MPPE debug */ /* Use "[]|}{?/><,`!2&&(" (sans quotes) for RFC 3079 MS-CHAPv2 test value */ static char *mschap_challenge = NULL; /* Use "!@\#$%^&*()_+:3|~" (sans quotes, backslash is to escape #) for ... */ static char *mschap2_peer_challenge = NULL; +#endif #include "fsm.h" /* Need to poke MPPE options */ #include "ccp.h" @@ -164,9 +165,11 @@ static void chapms_generate_challenge(unsigned char *challenge) { *challenge++ = 8; +#ifdef DEBUGMPPEKEY if (mschap_challenge && strlen(mschap_challenge) == 8) memcpy(challenge, mschap_challenge, 8); else +#endif random_bytes(challenge, 8); } @@ -174,9 +177,11 @@ static void chapms2_generate_challenge(unsigned char *challenge) { *challenge++ = 16; +#ifdef DEBUGMPPEKEY if (mschap_challenge && strlen(mschap_challenge) == 16) memcpy(challenge, mschap_challenge, 16); else +#endif random_bytes(challenge, 16); } @@ -186,17 +191,18 @@ chapms_verify_response(int id, char *name, unsigned char *challenge, unsigned char *response, char *message, int message_space) { - MS_ChapResponse *rmd = (MS_ChapResponse *) response; + MS_ChapResponse *rmd; MS_ChapResponse md; int diff; int challenge_len, response_len; challenge_len = *challenge++; /* skip length, is 8 */ - response_len = *response++; if (response_len != MS_CHAP_RESPONSE_LEN) goto bad; + rmd = (MS_ChapResponse *) response; + #ifndef MSLANMAN if (!rmd->UseNT[0]) { /* Should really propagate this into the error packet. */ @@ -206,7 +212,7 @@ chapms_verify_response(int id, char *name, #endif /* Generate the expected response. */ - ChapMS(challenge, secret, secret_len, &md); + ChapMS(challenge, (char *)secret, secret_len, &md); #ifdef MSLANMAN /* Determine which part of response to verify against */ @@ -235,7 +241,7 @@ chapms2_verify_response(int id, char *name, unsigned char *challenge, unsigned char *response, char *message, int message_space) { - MS_Chap2Response *rmd = (MS_Chap2Response *) response; + MS_Chap2Response *rmd; MS_Chap2Response md; char saresponse[MS_AUTH_RESPONSE_LENGTH+1]; int challenge_len, response_len; @@ -245,10 +251,12 @@ chapms2_verify_response(int id, char *name, if (response_len != MS_CHAP2_RESPONSE_LEN) goto bad; /* not even the right length */ + rmd = (MS_Chap2Response *) response; + /* Generate the expected response and our mutual auth. */ ChapMS2(challenge, rmd->PeerChallenge, name, - secret, secret_len, &md, - saresponse, MS_CHAP2_AUTHENTICATOR); + (char *)secret, secret_len, &md, + (unsigned char *)saresponse, MS_CHAP2_AUTHENTICATOR); /* compare MDs and send the appropriate status */ /* @@ -323,8 +331,13 @@ chapms2_make_response(unsigned char *response, int id, char *our_name, { challenge++; /* skip length, should be 16 */ *response++ = MS_CHAP2_RESPONSE_LEN; - ChapMS2(challenge, mschap2_peer_challenge, our_name, - secret, secret_len, + ChapMS2(challenge, +#ifdef DEBUGMPPEKEY + mschap2_peer_challenge, +#else + NULL, +#endif + our_name, secret, secret_len, (MS_Chap2Response *) response, private, MS_CHAP2_AUTHENTICATEE); } @@ -332,7 +345,8 @@ chapms2_make_response(unsigned char *response, int id, char *our_name, static int chapms2_check_success(unsigned char *msg, int len, unsigned char *private) { - if ((len < MS_AUTH_RESPONSE_LENGTH + 2) || strncmp(msg, "S=", 2)) { + if ((len < MS_AUTH_RESPONSE_LENGTH + 2) || + strncmp((char *)msg, "S=", 2) != 0) { /* Packet does not start with "S=" */ error("MS-CHAPv2 Success packet is badly formed."); return 0; @@ -348,7 +362,7 @@ chapms2_check_success(unsigned char *msg, int len, unsigned char *private) /* Authenticator Response matches. */ msg += MS_AUTH_RESPONSE_LENGTH; /* Eat it */ len -= MS_AUTH_RESPONSE_LENGTH; - if ((len >= 3) && !strncmp(msg, " M=", 3)) { + if ((len >= 3) && !strncmp((char *)msg, " M=", 3)) { msg += 3; /* Eat the delimiter */ } else if (len) { /* Packet has extra text which does not begin " M=" */ @@ -456,7 +470,7 @@ ChallengeResponse(u_char *challenge, #endif } -static void +void ChallengeHash(u_char PeerChallenge[16], u_char *rchallenge, char *username, u_char Challenge[8]) @@ -474,7 +488,7 @@ ChallengeHash(u_char PeerChallenge[16], u_char *rchallenge, SHA1_Init(&sha1Context); SHA1_Update(&sha1Context, PeerChallenge, 16); SHA1_Update(&sha1Context, rchallenge, 16); - SHA1_Update(&sha1Context, user, strlen(user)); + SHA1_Update(&sha1Context, (unsigned char *)user, strlen(user)); SHA1_Final(sha1Hash, &sha1Context); BCOPY(sha1Hash, Challenge, 8); @@ -509,7 +523,7 @@ NTPasswordHash(char *secret, int secret_len, u_char hash[MD4_SIGNATURE_SIZE]) MD4_CTX md4Context; MD4Init(&md4Context); - MD4Update(&md4Context, secret, mdlen); + MD4Update(&md4Context, (unsigned char *)secret, mdlen); MD4Final(hash, &md4Context); } @@ -523,7 +537,7 @@ ChapMS_NT(u_char *rchallenge, char *secret, int secret_len, /* Hash the Unicode version of the secret (== password). */ ascii2unicode(secret, secret_len, unicodePassword); - NTPasswordHash(unicodePassword, secret_len * 2, PasswordHash); + NTPasswordHash((char *)unicodePassword, secret_len * 2, PasswordHash); ChallengeResponse(rchallenge, PasswordHash, NTResponse); } @@ -536,11 +550,12 @@ ChapMS2_NT(char *rchallenge, u_char PeerChallenge[16], char *username, u_char PasswordHash[MD4_SIGNATURE_SIZE]; u_char Challenge[8]; - ChallengeHash(PeerChallenge, rchallenge, username, Challenge); + ChallengeHash(PeerChallenge, (unsigned char *)rchallenge, username, + Challenge); /* Hash the Unicode version of the secret (== password). */ ascii2unicode(secret, secret_len, unicodePassword); - NTPasswordHash(unicodePassword, secret_len * 2, PasswordHash); + NTPasswordHash((char *)unicodePassword, secret_len * 2, PasswordHash); ChallengeResponse(Challenge, PasswordHash, NTResponse); } @@ -569,8 +584,8 @@ ChapMS_LANMan(u_char *rchallenge, char *secret, int secret_len, #endif -static void -GenerateAuthenticatorResponse(char *secret, int secret_len, +void +GenerateAuthenticatorResponse(u_char PasswordHashHash[MD4_SIGNATURE_SIZE], u_char NTResponse[24], u_char PeerChallenge[16], u_char *rchallenge, char *username, u_char authResponse[MS_AUTH_RESPONSE_LENGTH+1]) @@ -592,19 +607,11 @@ GenerateAuthenticatorResponse(char *secret, int secret_len, int i; SHA1_CTX sha1Context; - u_char unicodePassword[MAX_NT_PASSWORD * 2]; - u_char PasswordHash[MD4_SIGNATURE_SIZE]; - u_char PasswordHashHash[MD4_SIGNATURE_SIZE]; u_char Digest[SHA1_SIGNATURE_SIZE]; u_char Challenge[8]; - /* Hash (x2) the Unicode version of the secret (== password). */ - ascii2unicode(secret, secret_len, unicodePassword); - NTPasswordHash(unicodePassword, secret_len * 2, PasswordHash); - NTPasswordHash(PasswordHash, sizeof(PasswordHash), PasswordHashHash); - SHA1_Init(&sha1Context); - SHA1_Update(&sha1Context, PasswordHashHash, sizeof(PasswordHashHash)); + SHA1_Update(&sha1Context, PasswordHashHash, MD4_SIGNATURE_SIZE); SHA1_Update(&sha1Context, NTResponse, 24); SHA1_Update(&sha1Context, Magic1, sizeof(Magic1)); SHA1_Final(Digest, &sha1Context); @@ -619,7 +626,29 @@ GenerateAuthenticatorResponse(char *secret, int secret_len, /* Convert to ASCII hex string. */ for (i = 0; i < MAX((MS_AUTH_RESPONSE_LENGTH / 2), sizeof(Digest)); i++) - sprintf(&authResponse[i * 2], "%02X", Digest[i]); + sprintf((char *)&authResponse[i * 2], "%02X", Digest[i]); +} + + +static void +GenerateAuthenticatorResponsePlain + (char *secret, int secret_len, + u_char NTResponse[24], u_char PeerChallenge[16], + u_char *rchallenge, char *username, + u_char authResponse[MS_AUTH_RESPONSE_LENGTH+1]) +{ + u_char unicodePassword[MAX_NT_PASSWORD * 2]; + u_char PasswordHash[MD4_SIGNATURE_SIZE]; + u_char PasswordHashHash[MD4_SIGNATURE_SIZE]; + + /* Hash (x2) the Unicode version of the secret (== password). */ + ascii2unicode(secret, secret_len, unicodePassword); + NTPasswordHash((char *)unicodePassword, secret_len * 2, PasswordHash); + NTPasswordHash((char *)PasswordHash, sizeof(PasswordHash), + PasswordHashHash); + + GenerateAuthenticatorResponse(PasswordHashHash, NTResponse, PeerChallenge, + rchallenge, username, authResponse); } @@ -643,6 +672,8 @@ mppe_set_keys(u_char *rchallenge, u_char PasswordHashHash[MD4_SIGNATURE_SIZE]) /* Same key in both directions. */ BCOPY(Digest, mppe_send_key, sizeof(mppe_send_key)); BCOPY(Digest, mppe_recv_key, sizeof(mppe_recv_key)); + + mppe_keys_set = 1; } /* @@ -665,14 +696,15 @@ Set_Start_Key(u_char *rchallenge, char *secret, int secret_len) /* * Set mppe_xxxx_key from MS-CHAPv2 credentials. (see RFC 3079) + * + * This helper function used in the Winbind module, which gets the + * NTHashHash from the server. */ -static void -SetMasterKeys(char *secret, int secret_len, u_char NTResponse[24], int IsServer) +void +mppe_set_keys2(u_char PasswordHashHash[MD4_SIGNATURE_SIZE], + u_char NTResponse[24], int IsServer) { SHA1_CTX sha1Context; - u_char unicodePassword[MAX_NT_PASSWORD * 2]; - u_char PasswordHash[MD4_SIGNATURE_SIZE]; - u_char PasswordHashHash[MD4_SIGNATURE_SIZE]; u_char MasterKey[SHA1_SIGNATURE_SIZE]; /* >= MPPE_MAX_KEY_LEN */ u_char Digest[SHA1_SIGNATURE_SIZE]; /* >= MPPE_MAX_KEY_LEN */ @@ -718,13 +750,8 @@ SetMasterKeys(char *secret, int secret_len, u_char NTResponse[24], int IsServer) 0x6b, 0x65, 0x79, 0x2e }; u_char *s; - /* Hash (x2) the Unicode version of the secret (== password). */ - ascii2unicode(secret, secret_len, unicodePassword); - NTPasswordHash(unicodePassword, secret_len * 2, PasswordHash); - NTPasswordHash(PasswordHash, sizeof(PasswordHash), PasswordHashHash); - SHA1_Init(&sha1Context); - SHA1_Update(&sha1Context, PasswordHashHash, sizeof(PasswordHashHash)); + SHA1_Update(&sha1Context, PasswordHashHash, MD4_SIGNATURE_SIZE); SHA1_Update(&sha1Context, NTResponse, 24); SHA1_Update(&sha1Context, Magic1, sizeof(Magic1)); SHA1_Final(MasterKey, &sha1Context); @@ -760,6 +787,24 @@ SetMasterKeys(char *secret, int secret_len, u_char NTResponse[24], int IsServer) SHA1_Final(Digest, &sha1Context); BCOPY(Digest, mppe_recv_key, sizeof(mppe_recv_key)); + + mppe_keys_set = 1; +} + +/* + * Set mppe_xxxx_key from MS-CHAPv2 credentials. (see RFC 3079) + */ +static void +SetMasterKeys(char *secret, int secret_len, u_char NTResponse[24], int IsServer) +{ + u_char unicodePassword[MAX_NT_PASSWORD * 2]; + u_char PasswordHash[MD4_SIGNATURE_SIZE]; + u_char PasswordHashHash[MD4_SIGNATURE_SIZE]; + /* Hash (x2) the Unicode version of the secret (== password). */ + ascii2unicode(secret, secret_len, unicodePassword); + NTPasswordHash(unicodePassword, secret_len * 2, PasswordHash); + NTPasswordHash(PasswordHash, sizeof(PasswordHash), PasswordHashHash); + mppe_set_keys2(PasswordHashHash, NTResponse, IsServer); } #endif /* MPPE */ @@ -769,9 +814,6 @@ void ChapMS(u_char *rchallenge, char *secret, int secret_len, MS_ChapResponse *response) { -#if 0 - CHAPDEBUG((LOG_INFO, "ChapMS: secret is '%.*s'", secret_len, secret)); -#endif BZERO(response, sizeof(*response)); ChapMS_NT(rchallenge, secret, secret_len, response->NTResp); @@ -787,7 +829,6 @@ ChapMS(u_char *rchallenge, char *secret, int secret_len, #ifdef MPPE Set_Start_Key(rchallenge, secret, secret_len); - mppe_keys_set = 1; #endif } @@ -822,17 +863,16 @@ ChapMS2(u_char *rchallenge, u_char *PeerChallenge, sizeof(response->PeerChallenge)); /* Generate the NT-Response */ - ChapMS2_NT(rchallenge, response->PeerChallenge, user, + ChapMS2_NT((char *)rchallenge, response->PeerChallenge, user, secret, secret_len, response->NTResp); /* Generate the Authenticator Response. */ - GenerateAuthenticatorResponse(secret, secret_len, response->NTResp, - response->PeerChallenge, rchallenge, - user, authResponse); + GenerateAuthenticatorResponsePlain(secret, secret_len, response->NTResp, + response->PeerChallenge, rchallenge, + user, authResponse); #ifdef MPPE SetMasterKeys(secret, secret_len, response->NTResp, authenticator); - mppe_keys_set = 1; #endif }