|
@@ -2208,26 +2208,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,
|