diff options
| author | Gustavo Zacarias <gustavo@zacarias.com.ar> | 2012-12-03 04:46:09 +0000 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2012-12-05 00:41:00 -0800 |
| commit | 32ed9ebca523347b3294cecfbe9053dbc5c5df9d (patch) | |
| tree | 20024b14eb75528c3e50079ad6a9f28f71876326 /package/wpa_supplicant | |
| parent | ba4021769d1aa9b72179c6da7960cc08d1c52d57 (diff) | |
| download | buildroot-novena-32ed9ebca523347b3294cecfbe9053dbc5c5df9d.tar.gz buildroot-novena-32ed9ebca523347b3294cecfbe9053dbc5c5df9d.zip | |
wpa_supplicant: bump to version 1.1
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/wpa_supplicant')
| -rw-r--r-- | package/wpa_supplicant/wpa_supplicant-openssl-1.0.1.patch | 54 | ||||
| -rw-r--r-- | package/wpa_supplicant/wpa_supplicant.mk | 2 |
2 files changed, 1 insertions, 55 deletions
diff --git a/package/wpa_supplicant/wpa_supplicant-openssl-1.0.1.patch b/package/wpa_supplicant/wpa_supplicant-openssl-1.0.1.patch deleted file mode 100644 index 2e110f43c..000000000 --- a/package/wpa_supplicant/wpa_supplicant-openssl-1.0.1.patch +++ /dev/null @@ -1,54 +0,0 @@ -From e6e243d97795306aeb604948e7101f9f14e8b8ca Mon Sep 17 00:00:00 2001 -From: Jouni Malinen <j@w1.fi> -Date: Fri, 17 Aug 2012 23:55:14 +0300 -Subject: [PATCH] Fix EAP-FAST with OpenSSL 1.0.1 - -The mechanism to figure out key block size based on ssl->read_hash -does not seem to work with OpenSSL 1.0.1, so add an alternative -mechanism to figure out the NAC key size that seems to work at -least with the current OpenSSL 1.0.1 releases. - -Signed-hostap: Jouni Malinen <j@w1.fi> -intended-for: hostap-1 -(cherry picked from commit 7f996409e7e5aa0bb066257906e87ab3294d4fd0) ---- - src/crypto/tls_openssl.c | 14 +++++++++++++- - 1 files changed, 13 insertions(+), 1 deletions(-) - -diff --git a/src/crypto/tls_openssl.c b/src/crypto/tls_openssl.c -index 6380ce0..c4a76be 100644 ---- a/src/crypto/tls_openssl.c -+++ b/src/crypto/tls_openssl.c -@@ -2785,6 +2785,7 @@ int tls_connection_get_keyblock_size(void *tls_ctx, - { - const EVP_CIPHER *c; - const EVP_MD *h; -+ int md_size; - - if (conn == NULL || conn->ssl == NULL || - conn->ssl->enc_read_ctx == NULL || -@@ -2798,9 +2799,20 @@ int tls_connection_get_keyblock_size(void *tls_ctx, - #else - h = conn->ssl->read_hash; - #endif -+ if (h) -+ md_size = EVP_MD_size(h); -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+ else if (conn->ssl->s3) -+ md_size = conn->ssl->s3->tmp.new_mac_secret_size; -+#endif -+ else -+ return -1; - -+ wpa_printf(MSG_DEBUG, "OpenSSL: keyblock size: key_len=%d MD_size=%d " -+ "IV_len=%d", EVP_CIPHER_key_length(c), md_size, -+ EVP_CIPHER_iv_length(c)); - return 2 * (EVP_CIPHER_key_length(c) + -- EVP_MD_size(h) + -+ md_size + - EVP_CIPHER_iv_length(c)); - } - --- -1.7.4-rc1 - diff --git a/package/wpa_supplicant/wpa_supplicant.mk b/package/wpa_supplicant/wpa_supplicant.mk index febb80cf0..71be11f11 100644 --- a/package/wpa_supplicant/wpa_supplicant.mk +++ b/package/wpa_supplicant/wpa_supplicant.mk @@ -4,7 +4,7 @@ # ############################################################# -WPA_SUPPLICANT_VERSION = 1.0 +WPA_SUPPLICANT_VERSION = 1.1 WPA_SUPPLICANT_SITE = http://hostap.epitest.fi/releases WPA_SUPPLICANT_LICENSE = GPLv2/BSD-3c WPA_SUPPLICANT_LICENSE_FILES = README |