aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDmitry Shmidt <dimitrysh@google.com>2014-02-20 10:31:24 -0800
committerDmitry Shmidt <dimitrysh@google.com>2014-02-20 10:31:24 -0800
commit745be3f298f4a0899238a99d96b7ed804edd3329 (patch)
tree8bde9f0274846685c2faff0b3f2069c0da7d750f /src
parent13ca8d8ea51a1aa5e24c6c956473a11b0c7daed4 (diff)
downloadandroid_external_wpa_supplicant_8-745be3f298f4a0899238a99d96b7ed804edd3329.tar.gz
android_external_wpa_supplicant_8-745be3f298f4a0899238a99d96b7ed804edd3329.tar.bz2
android_external_wpa_supplicant_8-745be3f298f4a0899238a99d96b7ed804edd3329.zip
Android: Remove explicit SSL_OP_NO_TLSv1_1 and SSL_OP_NO_TLSv1_2
Now wpa_supplicant allows to set these options dynamically per network by adding to 'phase1' "tls_disable_tlsv1_1=1" or "tls_disable_tlsv1_2=1" Change-Id: I954af5356833bed5b78c4ebf4a50c788ba984114 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'src')
-rw-r--r--src/crypto/tls_openssl.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/src/crypto/tls_openssl.c b/src/crypto/tls_openssl.c
index 0b4e2677..e6068286 100644
--- a/src/crypto/tls_openssl.c
+++ b/src/crypto/tls_openssl.c
@@ -1011,11 +1011,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 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());