diff options
| author | Steve Kondik <shade@chemlab.org> | 2012-07-18 19:34:46 -0700 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2012-07-18 19:34:46 -0700 |
| commit | 9fb98405130c2da07cfdbabc2774922851de96de (patch) | |
| tree | 278f80a3caeebdc5a019c6ded88a3b60541f7097 | |
| parent | 6acfb7c53bd8fe2eeedd6a96188ee1c4b01e8244 (diff) | |
| download | android_external_wpa_supplicant_8-9fb98405130c2da07cfdbabc2774922851de96de.tar.gz android_external_wpa_supplicant_8-9fb98405130c2da07cfdbabc2774922851de96de.tar.bz2 android_external_wpa_supplicant_8-9fb98405130c2da07cfdbabc2774922851de96de.zip | |
Revert "Don't use OpenSSL Engines in wpa_supplicant"
This reverts commit 6acfb7c53bd8fe2eeedd6a96188ee1c4b01e8244.
Engines are reenabled in Jelly Bean, and this patch breaks EAP.
| -rw-r--r-- | src/crypto/tls_openssl.c | 3 | ||||
| -rw-r--r-- | wpa_supplicant/Android.mk | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/src/crypto/tls_openssl.c b/src/crypto/tls_openssl.c index c9ffa1c4..aaa920bf 100644 --- a/src/crypto/tls_openssl.c +++ b/src/crypto/tls_openssl.c @@ -929,9 +929,6 @@ 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 0829347e..c6cf80b8 100644 --- a/wpa_supplicant/Android.mk +++ b/wpa_supplicant/Android.mk @@ -19,9 +19,6 @@ 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 |