jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Pass digest return value to CHAP/MSCHAPv2 caller

Browse source
This commit is contained in:
Jouni Malinen 2009-08-16 18:38:35 +03:00
parent 76f04b38b0
commit be299ca4ce
4 changed files with 27 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/eap_common/chap.c
View file

@ -1,6 +1,6 @@
/* /*
* CHAP-MD5 (RFC 1994) * CHAP-MD5 (RFC 1994)
* Copyright (c) 2007, Jouni Malinen <j@w1.fi> * Copyright (c) 2007-2009, Jouni Malinen <j@w1.fi>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as * it under the terms of the GNU General Public License version 2 as
@ -19,7 +19,7 @@
#include "crypto.h" #include "crypto.h"
#include "chap.h" #include "chap.h"
void chap_md5(u8 id, const u8 *secret, size_t secret_len, const u8 *challenge, int chap_md5(u8 id, const u8 *secret, size_t secret_len, const u8 *challenge,
size_t challenge_len, u8 *response) size_t challenge_len, u8 *response)
{ {
const u8 *addr[3]; const u8 *addr[3];
@ -31,5 +31,5 @@ void chap_md5(u8 id, const u8 *secret, size_t secret_len, const u8 *challenge,
len[1] = secret_len; len[1] = secret_len;
addr[2] = challenge; addr[2] = challenge;
len[2] = challenge_len; len[2] = challenge_len;
md5_vector(3, addr, len, response); return md5_vector(3, addr, len, response);
} }

4
src/eap_common/chap.h
View file

@ -1,6 +1,6 @@
/* /*
* CHAP-MD5 (RFC 1994) * CHAP-MD5 (RFC 1994)
* Copyright (c) 2007, Jouni Malinen <j@w1.fi> * Copyright (c) 2007-2009, Jouni Malinen <j@w1.fi>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as * it under the terms of the GNU General Public License version 2 as
@ -17,7 +17,7 @@
#define CHAP_MD5_LEN 16 #define CHAP_MD5_LEN 16
void chap_md5(u8 id, const u8 *secret, size_t secret_len, const u8 *challenge, int chap_md5(u8 id, const u8 *secret, size_t secret_len, const u8 *challenge,
size_t challenge_len, u8 *response); size_t challenge_len, u8 *response);
#endif /* CHAP_H */ #endif /* CHAP_H */

12
src/eap_peer/mschapv2.c
View file

@ -39,7 +39,7 @@ const u8 * mschapv2_remove_domain(const u8 *username, size_t *len)
} }
void mschapv2_derive_response(const u8 *identity, size_t identity_len, int mschapv2_derive_response(const u8 *identity, size_t identity_len,
const u8 *password, size_t password_len, const u8 *password, size_t password_len,
int pwhash, int pwhash,
const u8 *auth_challenge, const u8 *auth_challenge,
@ -93,14 +93,18 @@ void mschapv2_derive_response(const u8 *identity, size_t identity_len,
/* Generate master_key here since we have the needed data available. */ /* Generate master_key here since we have the needed data available. */
if (pwhash) { if (pwhash) {
hash_nt_password_hash(password, password_hash_hash); if (hash_nt_password_hash(password, password_hash_hash))
return -1;
} else { } else {
nt_password_hash(password, password_len, password_hash); if (nt_password_hash(password, password_len, password_hash) ||
hash_nt_password_hash(password_hash, password_hash_hash); hash_nt_password_hash(password_hash, password_hash_hash))
return -1;
} }
get_master_key(password_hash_hash, nt_response, master_key); get_master_key(password_hash_hash, nt_response, master_key);
wpa_hexdump_key(MSG_DEBUG, "MSCHAPV2: Master Key", wpa_hexdump_key(MSG_DEBUG, "MSCHAPV2: Master Key",
master_key, MSCHAPV2_MASTER_KEY_LEN); master_key, MSCHAPV2_MASTER_KEY_LEN);
return 0;
} }

2
src/eap_peer/mschapv2.h
View file

@ -21,7 +21,7 @@
#define MSCHAPV2_MASTER_KEY_LEN 16 #define MSCHAPV2_MASTER_KEY_LEN 16
const u8 * mschapv2_remove_domain(const u8 *username, size_t *len); const u8 * mschapv2_remove_domain(const u8 *username, size_t *len);
void mschapv2_derive_response(const u8 *username, size_t username_len, int mschapv2_derive_response(const u8 *username, size_t username_len,
const u8 *password, size_t password_len, const u8 *password, size_t password_len,
int pwhash, int pwhash,
const u8 *auth_challenge, const u8 *auth_challenge,