aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2012-07-26 15:20:13 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-07-26 15:20:13 -0700
commit21a1e4c6e69742ba96f610b4b0db2e5a2d95528a (patch)
tree76e0df35f0242198c5802420bfec8a617c4ca9c7 /src
parent04949598a23f501be6eec21697465fd46a28840a (diff)
parent27bf1073abe534644cc1146397082cc78873f516 (diff)
downloadexternal_wpa_supplicant_8-21a1e4c6e69742ba96f610b4b0db2e5a2d95528a.zip
external_wpa_supplicant_8-21a1e4c6e69742ba96f610b4b0db2e5a2d95528a.tar.gz
external_wpa_supplicant_8-21a1e4c6e69742ba96f610b4b0db2e5a2d95528a.tar.bz2
am 27bf1073: Use SSL_OP_NO_TLSv1_1 SSL_OP_NO_TLSv1_2 SSL_OP_NO_TICKET for better wpa_supplicant_8 interoperability
* commit '27bf1073abe534644cc1146397082cc78873f516': Use SSL_OP_NO_TLSv1_1 SSL_OP_NO_TLSv1_2 SSL_OP_NO_TICKET for better wpa_supplicant_8 interoperability
Diffstat (limited to 'src')
-rw-r--r--src/crypto/tls_openssl.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/crypto/tls_openssl.c b/src/crypto/tls_openssl.c
index 09b02e4..f2b541e 100644
--- a/src/crypto/tls_openssl.c
+++ b/src/crypto/tls_openssl.c
@@ -938,6 +938,11 @@ 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 ANDROID
+ options |= SSL_OP_NO_TLSv1_1;
+ options |= SSL_OP_NO_TLSv1_2;
+ options |= SSL_OP_NO_TICKET;
+#endif /* ANDROID */
SSL_set_options(conn->ssl, options);
conn->ssl_in = BIO_new(BIO_s_mem());