From 6acfb7c53bd8fe2eeedd6a96188ee1c4b01e8244 Mon Sep 17 00:00:00 2001 From: Robert Burns Date: Mon, 16 Jul 2012 14:55:15 -0400 Subject: Don't use OpenSSL Engines in wpa_supplicant The Android OpenSSL tree directs us to remove the engines subdir, so we shouldn't try to use engines in wpa_supplicant. Pulled portion from https://android-review.googlesource.com/#/c/11375/2 Change-Id: I4e85d960588eedcbad3de9a94c2641d48d94d2ac --- src/crypto/tls_openssl.c | 3 +++ wpa_supplicant/Android.mk | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/crypto/tls_openssl.c b/src/crypto/tls_openssl.c index aaa920bf..c9ffa1c4 100644 --- a/src/crypto/tls_openssl.c +++ b/src/crypto/tls_openssl.c @@ -929,6 +929,9 @@ struct tls_connection * tls_connection_init(void *ssl_ctx) #ifdef SSL_OP_NO_COMPRESSION options |= SSL_OP_NO_COMPRESSION; #endif /* SSL_OP_NO_COMPRESSION */ +#ifdef OPENSSL_NO_ENGINE + options |= SSL_OP_NO_TICKET; +#endif /* OPENSSL_NO_ENGINE */ SSL_set_options(conn->ssl, options); conn->ssl_in = BIO_new(BIO_s_mem()); diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk index c6cf80b8..0829347e 100644 --- a/wpa_supplicant/Android.mk +++ b/wpa_supplicant/Android.mk @@ -19,6 +19,9 @@ include $(LOCAL_PATH)/android.config # To ignore possible wrong network configurations L_CFLAGS = -DWPA_IGNORE_CONFIG_ERRORS +# OpenSSL is configured without engines on Android +L_CFLAGS += -DOPENSSL_NO_ENGINE + L_CFLAGS += -DVERSION_STR_POSTFIX=\"-$(PLATFORM_VERSION)\" # Set Android log name -- cgit v1.2.3