From b4421ecb217da30d5fa83f4857d39caaa331d5a7 Mon Sep 17 00:00:00 2001 From: Kenny Root Date: Wed, 26 Jun 2013 14:57:31 -0700 Subject: [PATCH] Remove obsolete keystore path It's not possible to get a raw private key from keystore anymore, so this would fail every time anyway. Remove it so it doesn't confuse anyone that looks at this code. Change-Id: I021fc1707b16474d8698c85055a6fcc4095cd215 --- src/crypto/tls_openssl.c | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/src/crypto/tls_openssl.c b/src/crypto/tls_openssl.c index 90acf84b8..d27af0af9 100644 --- a/src/crypto/tls_openssl.c +++ b/src/crypto/tls_openssl.c @@ -2100,26 +2100,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, -- 2.47.2