diff options
| author | Rui Paulo <rpaulo@FreeBSD.org> | 2013-06-25 02:47:41 +0000 |
|---|---|---|
| committer | Rui Paulo <rpaulo@FreeBSD.org> | 2013-06-25 02:47:41 +0000 |
| commit | 5e2639d568f6bb660501a77cc83413c3412562e3 (patch) | |
| tree | db97ebf07cc76b41926fb6696433b541307fbc19 /src/eap_common/eap_fast_common.c | |
| parent | 19f9885f6aafcd7c3eee4df8a014287d12279851 (diff) | |
Notes
Diffstat (limited to 'src/eap_common/eap_fast_common.c')
| -rw-r--r-- | src/eap_common/eap_fast_common.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/src/eap_common/eap_fast_common.c b/src/eap_common/eap_fast_common.c index 4de34a87b611d..04b987d237256 100644 --- a/src/eap_common/eap_fast_common.c +++ b/src/eap_common/eap_fast_common.c @@ -2,14 +2,8 @@ * EAP-FAST common helper functions (RFC 4851) * Copyright (c) 2008, Jouni Malinen <j@w1.fi> * - * 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 - * published by the Free Software Foundation. - * - * Alternatively, this software may be distributed under the terms of BSD - * license. - * - * See README and COPYING for more details. + * This software may be distributed under the terms of the BSD license. + * See README for more details. */ #include "includes.h" @@ -133,9 +127,9 @@ u8 * eap_fast_derive_key(void *ssl_ctx, struct tls_connection *conn, wpa_hexdump_key(MSG_MSGDUMP, "EAP-FAST: master_secret for key " "expansion", keys.master_key, keys.master_key_len); - if (tls_prf(keys.master_key, keys.master_key_len, - label, rnd, keys.client_random_len + - keys.server_random_len, out, block_size + len)) + if (tls_prf_sha1_md5(keys.master_key, keys.master_key_len, + label, rnd, keys.client_random_len + + keys.server_random_len, out, block_size + len)) goto fail; os_free(rnd); os_memmove(out, out + block_size, len); |