]> git.ipfire.org Git - thirdparty/hostap.git/commitdiff
Remove obsolete keystore path
authorKenny Root <kroot@google.com>
Wed, 26 Jun 2013 21:57:31 +0000 (14:57 -0700)
committerJouni Malinen <j@w1.fi>
Fri, 1 Nov 2013 14:35:34 +0000 (16:35 +0200)
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

index 90acf84b88a2e3d4a1fa0293d7f37251a4cf0031..d27af0af9c04d92a07ea809c10dae141bd68d395 100644 (file)
@@ -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,