aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJouni Malinen <jouni.malinen@atheros.com>2009-03-19 13:46:00 (GMT)
committerJouni Malinen <j@w1.fi>2009-03-22 14:20:02 (GMT)
commit53a9a0abd28bc3cd31f48c8cd879cebfe09aebdf (patch)
treefa05775f9b9e6e47daf5743a87fed4ced7569b2b
parenta109f0af0b0889676c9831c0c26237d47223a364 (diff)
downloadhostap-06-53a9a0abd28bc3cd31f48c8cd879cebfe09aebdf.zip
hostap-06-53a9a0abd28bc3cd31f48c8cd879cebfe09aebdf.tar.gz
hostap-06-53a9a0abd28bc3cd31f48c8cd879cebfe09aebdf.tar.bz2
Fix IEEE 802.11r key derivation function to match with the standard
IEEE Std 802.11r-2008, 8.5.1.5.2 starts the 'i' counter from 1, not 0. Note: this breaks interoperability with previous versions. [Bug 303] (cherry picked from commit 4cb0dcd92d560674865a951010bed5054f3fd26c) Conflicts: wpa_supplicant/ChangeLog
-rw-r--r--hostapd/ChangeLog2
-rw-r--r--src/crypto/sha256.c2
-rw-r--r--wpa_supplicant/ChangeLog2
3 files changed, 5 insertions, 1 deletions
diff --git a/hostapd/ChangeLog b/hostapd/ChangeLog
index 2e63696..a9e9773 100644
--- a/hostapd/ChangeLog
+++ b/hostapd/ChangeLog
@@ -7,6 +7,8 @@ ChangeLog for hostapd
authentication server
* driver_prism54: fixed segmentation fault on initialization
* fixed TNC with EAP-TTLS
+ * fixed IEEE 802.11r key derivation function to match with the standard
+ (note: this breaks interoperability with previous version) [Bug 303]
2009-02-15 - v0.6.8
* increased hostapd_cli ping interval to 5 seconds and made this
diff --git a/src/crypto/sha256.c b/src/crypto/sha256.c
index 3d3958f..96dac0e 100644
--- a/src/crypto/sha256.c
+++ b/src/crypto/sha256.c
@@ -122,7 +122,7 @@ void hmac_sha256(const u8 *key, size_t key_len, const u8 *data,
void sha256_prf(const u8 *key, size_t key_len, const char *label,
const u8 *data, size_t data_len, u8 *buf, size_t buf_len)
{
- u16 counter = 0;
+ u16 counter = 1;
size_t pos, plen;
u8 hash[SHA256_MAC_LEN];
const u8 *addr[4];
diff --git a/wpa_supplicant/ChangeLog b/wpa_supplicant/ChangeLog
index ec9b5e8..36a2a73 100644
--- a/wpa_supplicant/ChangeLog
+++ b/wpa_supplicant/ChangeLog
@@ -3,6 +3,8 @@ ChangeLog for wpa_supplicant
????-??-?? - v0.6.9
* driver_ndis: add PAE group address to the multicast address list to
fix wired IEEE 802.1X authentication
+ * fixed IEEE 802.11r key derivation function to match with the standard
+ (note: this breaks interoperability with previous version) [Bug 303]
2009-02-15 - v0.6.8
* increased wpa_cli ping interval to 5 seconds and made this