aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2012-07-26 15:48:49 -0700
committerandroid code review <noreply-gerritcodereview@google.com>2012-07-26 15:48:50 -0700
commite3bf5a169f6a766bbde14ea0176c4bc284af4c2a (patch)
treeecc3e2d0015a86a51d787044defb13b885d21965
parent4f0c8cbfd0547e3163aa6fc6403d8def63e227a2 (diff)
parent0909bece42c42eac7a494b4bbe94bac2114d3acb (diff)
downloadwpa_supplicant_6-e3bf5a169f6a766bbde14ea0176c4bc284af4c2a.tar.gz
Merge "Use SSL_OP_NO_TLSv1_1 SSL_OP_NO_TLSv1_2 SSL_OP_NO_TICKET for better wpa_supplicant_6 interoperability"
-rw-r--r--wpa_supplicant/src/crypto/tls_openssl.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/wpa_supplicant/src/crypto/tls_openssl.c b/wpa_supplicant/src/crypto/tls_openssl.c
index 3d468ec..70fe79c 100644
--- a/wpa_supplicant/src/crypto/tls_openssl.c
+++ b/wpa_supplicant/src/crypto/tls_openssl.c
@@ -887,6 +887,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());