diff options
| author | Kenny Root <kroot@google.com> | 2013-06-26 16:51:44 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-06-26 16:51:44 -0700 |
| commit | 65699d14fab37ab374ce46c6192d4e9b56ec26c1 (patch) | |
| tree | 8bda23f9c2a420c16cfeed4bfd7356b5f9c8647f | |
| parent | 7d96eda062fd58d2ab28311bd0c8ab9193da4080 (diff) | |
| parent | 499d68402f55bd1b8aa1a0d9c6966c7392704fba (diff) | |
| download | wpa_supplicant_8-tools_r22.2.tar.gz | |
am 499d6840: Merge "Remove obsolete keystore path"tools_r22.2
* commit '499d68402f55bd1b8aa1a0d9c6966c7392704fba':
Remove obsolete keystore path
| -rw-r--r-- | src/crypto/tls_openssl.c | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/src/crypto/tls_openssl.c b/src/crypto/tls_openssl.c index 2bf47c7c..e226f1a8 100644 --- a/src/crypto/tls_openssl.c +++ b/src/crypto/tls_openssl.c @@ -2035,26 +2035,6 @@ static int tls_connection_private_key(void *_ssl_ctx, break; } -#ifdef ANDROID - if (!ok && private_key && - os_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) { - wpa_printf(MSG_DEBUG, "OpenSSL: Private key " - "from keystore"); - ok = 1; - } - EVP_PKEY_free(pkey); - } - } -#endif /* ANDROID */ - while (!ok && private_key) { #ifndef OPENSSL_NO_STDIO if (SSL_use_PrivateKey_file(conn->ssl, private_key, |