commit 5a8011fbbc6015171f329637aa00b43fe2afcf10
author The Android Automerger <android-build@android.com> Tue Jul 31 14:07:17 2012 -0700
committer The Android Automerger <android-build@android.com> Tue Jul 31 14:07:17 2012 -0700
tree ecc3e2d0015a86a51d787044defb13b885d21965
parent 617450fed233b4b17a8a7c7b9f60ecabc513df21
parent e384980bbfc1a028763d728716ecf960fe3bf440

merge in jb-mr0-release history after reset to jb-dev

wpa_supplicant/src/crypto/tls_openssl.c

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 @@
 #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());