hdparm: bump to version 9.42
PATCH 1/5 hdparm: bump to version 9.42
Signed-off-by Gustavo Zacarias <[email protected]>
--- package/hdparm/hdparm.mk | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)
package/hdparm/hdparm.mk +3 -1
@@ -4,8 +4,10 @@ # ############################################################# -HDPARM_VERSION = 9.39 +HDPARM_VERSION = 9.42 HDPARM_SITE = http://downloads.sourceforge.net/project/hdparm/hdparm +HDPARM_LICENSE = BSD-Style +HDPARM_LICENSE_FILES = LICENSE.TXT define HDPARM_BUILD_CMDS $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \
Signature · 1 line
1.7.8.6
PATCH 2/5 ipset: bump to version 6.14
Signed-off-by Gustavo Zacarias <[email protected]>
--- package/ipset/ipset.mk | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)
package/ipset/ipset.mk +3 -1
@@ -4,10 +4,12 @@ # ############################################################# -IPSET_VERSION = 6.13 +IPSET_VERSION = 6.14 IPSET_SOURCE = ipset-$(IPSET_VERSION).tar.bz2 IPSET_SITE = http://ipset.netfilter.org IPSET_DEPENDENCIES = libmnl host-pkgconf IPSET_CONF_OPT = --with-kmod=no +IPSET_LICENSE = GPLv2 +IPSET_LICENSE_FILES = COPYING $(eval $(autotools-package))
Signature · 1 line
1.7.8.6
PATCH 3/5 iproute2: bump to version 3.6.0
In reply to Gustavo ZacariasSigned-off-by Gustavo Zacarias <[email protected]>
--- package/iproute2/iproute2.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
package/iproute2/iproute2.mk +1 -1
@@ -4,7 +4,7 @@ # ############################################################# -IPROUTE2_VERSION = 3.5.1 +IPROUTE2_VERSION = 3.6.0 IPROUTE2_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/net/iproute2 IPROUTE2_TARGET_SBINS = ctstat genl ifstat ip lnstat nstat routef routel rtacct rtmon rtpr rtstat ss tc IPROUTE2_LICENSE = GPLv2
Signature · 1 line
1.7.8.6
PATCH 4/5 hostapd: add openssl 1.0.1 patch
In reply to Gustavo ZacariasSigned-off-by Gustavo Zacarias <[email protected]>
--- package/hostapd/hostapd-openssl-1.0.1.patch | 54 +++++++++++++++++++++++++++ 1 files changed, 54 insertions(+), 0 deletions(-) create mode 100644 package/hostapd/hostapd-openssl-1.0.1.patch
package/hostapd/hostapd-openssl-1.0.1.patch new file +54 -0
@@ -0,0 +1,54 @@ +From e6e243d97795306aeb604948e7101f9f14e8b8ca Mon Sep 17 00:00:00 2001 +From: Jouni Malinen <[email protected]> +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 <[email protected]> +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 +
Signature · 1 line
1.7.8.6
PATCH 5/5 wpa_supplicant: add openssl 1.0.1 patch
In reply to Gustavo ZacariasSigned-off-by Gustavo Zacarias <[email protected]>
--- .../wpa_supplicant-openssl-1.0.1.patch | 54 ++++++++++++++++++++ 1 files changed, 54 insertions(+), 0 deletions(-) create mode 100644 package/wpa_supplicant/wpa_supplicant-openssl-1.0.1.patch
package/wpa_supplicant/wpa_supplicant-openssl-1.0.1.patch new file +54 -0
@@ -0,0 +1,54 @@ +From e6e243d97795306aeb604948e7101f9f14e8b8ca Mon Sep 17 00:00:00 2001 +From: Jouni Malinen <[email protected]> +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 <[email protected]> +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 +
Signature · 1 line
1.7.8.6
PATCH 1/5 hdparm: bump to version 9.42
In reply to Gustavo ZacariasQuoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Gustavo" == Gustavo Zacarias <[email protected]> writes:
Gustavo> Signed-off-by: Gustavo Zacarias <[email protected]>
Committed all 5, thanks.
Signature · 1 line
Bye, Peter Korsgaard