From patchwork Tue Mar 20 20:05:25 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kenny Root X-Patchwork-Id: 288692 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from maxx.maxx.shmoo.com (maxx.shmoo.com [205.134.188.171]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "maxx.shmoo.com", Issuer "CA Cert Signing Authority" (not verified)) by ozlabs.org (Postfix) with ESMTPS id A8B212C00D1 for ; Wed, 6 Nov 2013 11:43:12 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id DFB3C9D1E7; Tue, 5 Nov 2013 19:43:10 -0500 (EST) X-Virus-Scanned: amavisd-new at maxx.shmoo.com Received: from maxx.maxx.shmoo.com ([127.0.0.1]) by localhost (maxx.shmoo.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id DN8NrDn96Jb8; Tue, 5 Nov 2013 19:43:10 -0500 (EST) Received: from maxx.shmoo.com (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id DE2829D1FE; Tue, 5 Nov 2013 19:42:47 -0500 (EST) X-Original-To: mailman-post+hostap@maxx.shmoo.com Delivered-To: mailman-post+hostap@maxx.shmoo.com Received: from localhost (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id F24979D211 for ; Tue, 5 Nov 2013 19:42:45 -0500 (EST) X-Virus-Scanned: amavisd-new at maxx.shmoo.com Received: from maxx.maxx.shmoo.com ([127.0.0.1]) by localhost (maxx.shmoo.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id S9hDJk0rJeHl for ; Tue, 5 Nov 2013 19:42:41 -0500 (EST) Received: from mail-pb0-f74.google.com (mail-pb0-f74.google.com [209.85.160.74]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (not verified)) by maxx.maxx.shmoo.com (Postfix) with ESMTPS id 08E169D1FE for ; Tue, 5 Nov 2013 19:42:26 -0500 (EST) Received: by mail-pb0-f74.google.com with SMTP id jt11so912571pbb.3 for ; Tue, 05 Nov 2013 16:42:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:date:subject:to:message-id; bh=hp3x7qA+9D+pLOneknyUZc+cXakcQUzkeAxexa3OiPY=; b=AIt1eOPH3qzlxgagwfQZSHykdDTES/J2qn3Ra1HWRWFSsSggaeDMXGx3X+YkdkhO2b zEEvYhpvTka7y6Jz/AOrMTCJaIOUmmQOp5qumya8lXxfXMT5TuUxVzQrgEyCGpLmX/tH zLp4I0X3VrwRAs+roY4DIojuPrluKTNucfqenSWVdrk9rJ4RXbL06rbatbtKi0V7NH4a iYYoHW3bSbMTDsxc7Xnd/xuwQD47WBIgLHYyaBjxwIDiKzcSbngx0AMG8fpXYWSLkBHc 6lvTigpOaP7cNO05O8xOgIDUpCVPg0BGFk/fEfXgYDtdMiCiA9064J6/uhg5c6pggVUt +TOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:date:subject:to:message-id; bh=hp3x7qA+9D+pLOneknyUZc+cXakcQUzkeAxexa3OiPY=; b=fvndzNnoKmN5ny6jFQnwcGulIgToAG6KbfhaQKCFxiu3BrEtMkXl3XGo80Kh37GlUU MuMQXgjO+tn+aWjk6zH663nJNdw+znQjjFYlVxPevLqR80QJq2BKtcbFX2GSKS+k1x1J H/DS6Us67MdMY1uc2oLbSgBHSOyWCwXsJ6Ay6K2WdxOjqDGI2clcP4OoAWFzL5mrjhQP apa+Kd65m+BGMlxggksjuw0lbdRlo52STjXsKZRoY6BRxzzAGx0AOfy/dUNzpni2DtXO SU4feE/6JqJjVn4cyaDHk1Wh4LUt4T8dSiWWyPnfRJd73re2YzuApQEX/o4aUcx1UvpF xdzg== X-Gm-Message-State: ALoCoQmQi/W2d7fZZGlprKXrFy+ypLBWxvPAk311CxL0OU87iAVz742/ZmCkEQJm58U5TVq83O35NWtzQCm/hQ478hCWYy1pE8jqmUNlmm72zF99a+KPzqDcC+2F5VfoCmI/P6WlklUumyvM1OgjRD2jpJ7rsz3NJAIeBZsIUi5SA3tbFqSeRpEkuhXCp9DclPC9NF3OS6EygZ/SoHq+Wz0wQmbiO729h/LgVOhCd4KZkukp7TAuKkS8hUmTEJuDnxP1fLoFajA4 X-Received: by 10.66.240.4 with SMTP id vw4mr504963pac.10.1383698545714; Tue, 05 Nov 2013 16:42:25 -0800 (PST) Received: from corp2gmr1-2.hot.corp.google.com (corp2gmr1-2.hot.corp.google.com [172.24.189.93]) by gmr-mx.google.com with ESMTPS id c8si2521851yhk.7.2013.11.05.16.42.25 for (version=TLSv1.1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 05 Nov 2013 16:42:25 -0800 (PST) Received: from ushik.mtv.corp.google.com (ushik.mtv.corp.google.com [172.18.120.113]) by corp2gmr1-2.hot.corp.google.com (Postfix) with ESMTP id 73CF55A41A1 for ; Tue, 5 Nov 2013 16:42:25 -0800 (PST) Received: by ushik.mtv.corp.google.com (Postfix, from userid 57417) id 1BA7213FAD3; Tue, 5 Nov 2013 16:42:24 -0800 (PST) From: Kenny Root Date: Tue, 20 Mar 2012 13:05:25 -0700 Subject: [PATCH] Restore OpenSSL ENGINE support To: hostap@lists.shmoo.com Message-Id: <20131106004225.1BA7213FAD3@ushik.mtv.corp.google.com> X-BeenThere: hostap@lists.shmoo.com X-Mailman-Version: 2.1.11 Precedence: list List-Id: HostAP Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: hostap-bounces@lists.shmoo.com Errors-To: hostap-bounces@lists.shmoo.com We now use an OpenSSL ENGINE to support keystore functionality. Change-Id: Ifa654183a86462e1542c58dd39e20ffe11a8edfa --- hostapd/Android.mk | 3 --- wpa_supplicant/Android.mk | 3 --- 2 files changed, 6 deletions(-) diff --git a/hostapd/Android.mk b/hostapd/Android.mk index 33e69d9..2be5e6e 100644 --- a/hostapd/Android.mk +++ b/hostapd/Android.mk @@ -30,9 +30,6 @@ endif # To allow non-ASCII characters in SSID L_CFLAGS += -DWPA_UNICODE_SSID -# OpenSSL is configured without engines on Android -L_CFLAGS += -DOPENSSL_NO_ENGINE - INCLUDES = $(LOCAL_PATH) INCLUDES += $(LOCAL_PATH)/src INCLUDES += $(LOCAL_PATH)/src/utils diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk index 07bea32..f1ccc2e 100644 --- a/wpa_supplicant/Android.mk +++ b/wpa_supplicant/Android.mk @@ -57,9 +57,6 @@ endif # To allow non-ASCII characters in SSID L_CFLAGS += -DWPA_UNICODE_SSID -# OpenSSL is configured without engines on Android -L_CFLAGS += -DOPENSSL_NO_ENGINE - INCLUDES = $(LOCAL_PATH) INCLUDES += $(LOCAL_PATH)/src INCLUDES += $(LOCAL_PATH)/src/common