aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2012-07-25 23:11:44 -0700
committerRobert Burns <burnsra@gmail.com>2012-08-02 00:31:15 -0400
commit761806989e3c9d44bba9b477ca125e3edf522137 (patch)
tree3eeb46b75dc8b31e80dea3017205bdc150836712
parent824ef55658a7b79b12725a63a30fdc41506b78d4 (diff)
downloadandroid_external_wpa_supplicant_8-761806989e3c9d44bba9b477ca125e3edf522137.tar.gz
android_external_wpa_supplicant_8-761806989e3c9d44bba9b477ca125e3edf522137.tar.bz2
android_external_wpa_supplicant_8-761806989e3c9d44bba9b477ca125e3edf522137.zip
Use SSL_OP_NO_TLSv1_1 SSL_OP_NO_TLSv1_2 SSL_OP_NO_TICKET for better wpa_supplicant_8 interoperability
Bug: https://bugs.launchpad.net/ubuntu/+source/wpasupplicant/+bug/969343/comments/72 Bug: http://w1.fi/bugz/show_bug.cgi?id=447#c7 Bug: http://code.google.com/p/android/issues/detail?id=34212 Bug: 6883259 (cherry-picked from 27bf1073abe534644cc1146397082cc78873f516) Change-Id: I9364e94853a404130125ab8df791193a886fdd34
-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 aaa920bf..be94e8a7 100644
--- a/src/crypto/tls_openssl.c
+++ b/src/crypto/tls_openssl.c
@@ -929,6 +929,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());