Amazing-Mirror/fragattacks
1
0
Fork 0
mirror of https://github.com/vanhoefm/fragattacks.git synced 2024-11-29 02:38:22 -05:00
Code Issues Projects Releases Wiki Activity

Android: Remove obsolete keystore path

Browse Source 
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.

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
This commit is contained in:
Kenny Root 2013-06-26 14:57:31 -07:00 committed by Jouni Malinen
parent 1176ab6dd4
commit 6dfdb80959
1 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/crypto/tls_openssl.c
View File

@ -2208,26 +2208,6 @@ static int tls_connection_private_key(void *_ssl_ctx,
break; 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) { while (!ok && private_key) {
#ifndef OPENSSL_NO_STDIO #ifndef OPENSSL_NO_STDIO
if (SSL_use_PrivateKey_file(conn->ssl, private_key, if (SSL_use_PrivateKey_file(conn->ssl, private_key,