diff options
| -rw-r--r-- | src/crypto/tls_openssl.c | 35 | ||||
| -rw-r--r-- | wpa_supplicant/Android.mk | 2 |
2 files changed, 18 insertions, 19 deletions
diff --git a/src/crypto/tls_openssl.c b/src/crypto/tls_openssl.c index dfb63ad7..2bf47c7c 100644 --- a/src/crypto/tls_openssl.c +++ b/src/crypto/tls_openssl.c @@ -24,11 +24,6 @@ #include <openssl/engine.h> #endif /* OPENSSL_NO_ENGINE */ -#ifdef ANDROID -#include <openssl/pem.h> -#include "keystore_get.h" -#endif /* ANDROID */ - #include "common.h" #include "crypto.h" #include "tls.h" @@ -49,6 +44,23 @@ #endif #endif +#ifdef ANDROID +#include <openssl/pem.h> +#include <keystore/keystore_get.h> + +static BIO * BIO_from_keystore(const char *key) +{ + BIO *bio = NULL; + uint8_t *value = NULL; + int length = keystore_get(key, strlen(key), &value); + if (length != -1 && (bio = BIO_new(BIO_s_mem())) != NULL) { + BIO_write(bio, value, length); + } + free(value); + return bio; +} +#endif /* ANDROID */ + static int tls_openssl_ref_count = 0; struct tls_global { @@ -1333,19 +1345,6 @@ static int tls_load_ca_der(void *_ssl_ctx, const char *ca_cert) #endif /* OPENSSL_NO_STDIO */ -#ifdef ANDROID -static BIO * BIO_from_keystore(const char *key) -{ - BIO *bio = NULL; - char value[KEYSTORE_MESSAGE_SIZE]; - int length = keystore_get(key, strlen(key), value); - if (length != -1 && (bio = BIO_new(BIO_s_mem())) != NULL) - BIO_write(bio, value, length); - return bio; -} -#endif /* ANDROID */ - - static int tls_connection_ca_cert(void *_ssl_ctx, struct tls_connection *conn, const char *ca_cert, const u8 *ca_cert_blob, size_t ca_cert_blob_len, const char *ca_path) diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk index 4f58a920..7438ba15 100644 --- a/wpa_supplicant/Android.mk +++ b/wpa_supplicant/Android.mk @@ -1516,7 +1516,7 @@ LOCAL_STATIC_LIBRARIES += $(BOARD_WPA_SUPPLICANT_PRIVATE_LIB) endif LOCAL_SHARED_LIBRARIES := libc libcutils ifeq ($(CONFIG_TLS), openssl) -LOCAL_SHARED_LIBRARIES += libcrypto libssl +LOCAL_SHARED_LIBRARIES += libcrypto libssl libkeystore_binder endif ifdef CONFIG_DRIVER_NL80211 LOCAL_STATIC_LIBRARIES += libnl_2 |