From patchwork Mon Dec 3 14:46:09 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Zacarias X-Patchwork-Id: 203374 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 0BA842C007D for ; Tue, 4 Dec 2012 01:47:39 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id A24CBA017C; Mon, 3 Dec 2012 14:47:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id vFFMI2vGPI7K; Mon, 3 Dec 2012 14:47:32 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id F2DC8A0170; Mon, 3 Dec 2012 14:47:30 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 138498F74A for ; Mon, 3 Dec 2012 14:47:34 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 6D297A0186 for ; Mon, 3 Dec 2012 14:47:28 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id jgVGTQ+SbywX for ; Mon, 3 Dec 2012 14:47:24 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from loknar.toptech.com.ar (loknar.toptech.com.ar [78.46.79.162]) by hemlock.osuosl.org (Postfix) with ESMTPS id 63C58A01A7 for ; Mon, 3 Dec 2012 14:47:19 +0000 (UTC) Received: from asgard (host201.201-252-64.telecom.net.ar [201.252.64.201]) (authenticated bits=0) by loknar.toptech.com.ar (8.14.5/8.14.5) with ESMTP id qB3ElBFi014790 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 3 Dec 2012 14:47:14 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=zacarias.com.ar; s=dkey; t=1354546036; bh=2pHB0r4SD9kyxoSVGJzFVg558Mc7odcTRV4U6WIkSFQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=anCmMp25UXDT4vzEyQC3dUJ/ZyWeuPI7YZVx9P8cprnExmb+BlgVlxL/nFVj7Kdif vUC4+0mpjiqVOldES6aFjZjZYOiexoiyFkAgigjeGu5/zE33L8IpNsldJzm5VlnVW0 /XaZo9SkhdQ9dRVurmIWJ9ylmMLc25gcMCHVKnY0= Received: by asgard (sSMTP sendmail emulation); Mon, 03 Dec 2012 11:47:11 -0300 From: Gustavo Zacarias To: buildroot@busybox.net Date: Mon, 3 Dec 2012 11:46:09 -0300 Message-Id: <1354545972-26783-11-git-send-email-gustavo@zacarias.com.ar> X-Mailer: git-send-email 1.7.8.6 In-Reply-To: <1354545972-26783-1-git-send-email-gustavo@zacarias.com.ar> References: <1354545972-26783-1-git-send-email-gustavo@zacarias.com.ar> X-Virus-Scanned: clamav-milter 0.97.5 at loknar X-Virus-Status: Clean Subject: [Buildroot] [PATCH 11/14] wpa_supplicant: bump to version 1.1 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net Signed-off-by: Gustavo Zacarias --- .../wpa_supplicant-openssl-1.0.1.patch | 54 -------------------- package/wpa_supplicant/wpa_supplicant.mk | 2 +- 2 files changed, 1 insertions(+), 55 deletions(-) delete mode 100644 package/wpa_supplicant/wpa_supplicant-openssl-1.0.1.patch 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 2e110f4..0000000 --- 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 -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 -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 febb80c..71be11f 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