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: 289524 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 6A3082C007E for ; Fri, 8 Nov 2013 10:14:11 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id 87EA89D28B; Thu, 7 Nov 2013 18:14:08 -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 V9eHFWG5OxpS; Thu, 7 Nov 2013 18:14:08 -0500 (EST) Received: from maxx.shmoo.com (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id 7243B9D26F; Thu, 7 Nov 2013 18:13:32 -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 656A89D20F for ; Thu, 7 Nov 2013 18:13:30 -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 aAczJvOEK83F for ; Thu, 7 Nov 2013 18:13:26 -0500 (EST) Received: from mail-qe0-f74.google.com (mail-qe0-f74.google.com [209.85.128.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 186809D228 for ; Thu, 7 Nov 2013 18:13:17 -0500 (EST) Received: by mail-qe0-f74.google.com with SMTP id 1so101890qec.5 for ; Thu, 07 Nov 2013 15:13:17 -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=zBlg6p/HhFwQwbe3XBiSkZAl9hYnv7vxMazsjNH82vA=; b=XDj5VMcrji9+afuqMKTT2B4l5P/Y3fAmW1wW2bCzk8anSTmK9aW1eei0L7E+ZbZpTF rxjLyZdFw1ajm9JEbkRNFYmlDxOtCOjvgT1IMLHKjf4rargz2WKNnKzsYQZeElrjW13e NPtL/B9IZIKZiCzDCBQKDzsd+Tp/YaEfYlNj8cK5a3JzzRr7K3mWz2h8pH47zmFlkkzb mtpHkdFycDkxdWT02U5Y34ah/23YoQqt2xcC5vjhyMRFKQs4O6WNujBdOLpMTuKTNx1w dqFMks2QyEBhyLA04dLnoLzL0Uek21z7j5fCD+J8LQApKWG7rpMv61oF2AcVjuLEOwbU MpCg== 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=zBlg6p/HhFwQwbe3XBiSkZAl9hYnv7vxMazsjNH82vA=; b=YHM1Z2Y2EARVamaiRGiydUpoJNsC45fbOu51o+M2vEy8egP8+5zTafEr6ONve5iNCK cojthNWNxmvE6sWAf+G1Ax/1yVMIBVzivgD5uRNvqqHEKgZ5XeEhAWFOwJ/vn5Yo/kcx +9Mp+tm2hzq4Yct1LwgXcHbQ5XM8wqonWbr7jHHl1aixWtrGrYx1tr92wylnGNmG0fZZ zpQDgml0NK59un2jis1ybg8ZJ08vK3c0SYri/f3kHZOvLC+sfjC9SeSHRu/fZY6+LS1N CK8QpYXHLkvjpmK3A9j7RGf3imwB/wDPyboR57XRKLDzI6WK/KDqOgLor670ybSrbNn2 0TWg== X-Gm-Message-State: ALoCoQlpE4tIkb07apNZr6eanWDo7631r7zOJswMVaZ/iddegfY0vFqA/wX849PkQDB5Mlgwrt2ezBdsncRmUBrQcgug0B5Lz2fDWb7v3uyuRB5cSwMbqkidWwP0hBEIkRWXrdDwvefT6NUsA7ZzQLR0F50xAEXegA4lxT6livxpNjS+B03sb3zg5+LLH3joHJQHj2riBEQ2kGpIxYZwJSnQex24G0UkUSMnEIP+IVr+ruvG3Dw5e0MkWmBaPiWxnVyZXC5TYWB8 X-Received: by 10.58.238.199 with SMTP id vm7mr3612449vec.17.1383865997605; Thu, 07 Nov 2013 15:13:17 -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 c8si792719yhk.7.2013.11.07.15.13.17 for (version=TLSv1.1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 07 Nov 2013 15:13:17 -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 6DBE55A42A1 for ; Thu, 7 Nov 2013 15:13:17 -0800 (PST) Received: by ushik.mtv.corp.google.com (Postfix, from userid 57417) id 2C06D1400A2; Thu, 7 Nov 2013 15:13:16 -0800 (PST) From: Kenny Root Date: Tue, 20 Mar 2012 13:05:25 -0700 Subject: [PATCH 4/8] Restore OpenSSL ENGINE support To: hostap@lists.shmoo.com Message-Id: <20131107231317.2C06D1400A2@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 Signed-off-by: Dmitry Shmidt --- 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 e0ae862..faaf1e2 100644 --- a/hostapd/Android.mk +++ b/hostapd/Android.mk @@ -44,9 +44,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 c1054e4..0d9e18c 100644 --- a/wpa_supplicant/Android.mk +++ b/wpa_supplicant/Android.mk @@ -54,9 +54,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