commit b0491060cfdd907dffc147e36c18dad1aca50502
author Kenny Root <kroot@google.com> Wed Jun 26 23:50:07 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jun 26 23:50:07 2013 +0000
tree 605882e17f05a0eb06c3df05aef23e0ad426188a
parent 84e8ef1d129ace1b1300efc836f7aa672cb71c05
parent 7969f7200130a00ea0baf68d16f177b5fcb05a67

Merge "Remove obsolete keystore path"

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 3e5d8ca..f0c63d5 100644
--- a/wpa_supplicant/src/crypto/tls_openssl.c
+++ b/wpa_supplicant/src/crypto/tls_openssl.c
@@ -1754,23 +1754,6 @@
 		break;
 	}
 
-#ifdef ANDROID
-	if (!ok && private_key && strncmp("keystore://", private_key, 11) == 0) {
-		BIO *bio = BIO_from_keystore(&private_key[11]);
-		EVP_PKEY *pkey = NULL;
-		if (bio) {
-			pkey = PEM_read_bio_PrivateKey(bio, NULL, NULL, NULL);
-			BIO_free(bio);
-		}
-		if (pkey) {
-			if (SSL_use_PrivateKey(conn->ssl, pkey) == 1) {
-				ok = 1;
-			}
-			EVP_PKEY_free(pkey);
-		}
-	}
-#endif
-
 	while (!ok && private_key) {
 #ifndef OPENSSL_NO_STDIO
 		if (SSL_use_PrivateKey_file(conn->ssl, private_key,