aboutsummaryrefslogtreecommitdiffstats
path: root/wpa_supplicant/Android.mk
diff options
context:
space:
mode:
authorJouni Malinen <jouni@qca.qualcomm.com>2015-01-27 11:57:59 (GMT)
committerJouni Malinen <j@w1.fi>2015-01-28 11:09:31 (GMT)
commitf19c907822ad0dec3480b1435b615ae22c5533a1 (patch)
tree0b3f659ff97c78ce931eddc58d4ef5d56ebbefd1 /wpa_supplicant/Android.mk
parentfee31f76cdc389c549efdea4d6cfbdef3c76b62d (diff)
downloadhostap-f19c907822ad0dec3480b1435b615ae22c5533a1.zip
hostap-f19c907822ad0dec3480b1435b615ae22c5533a1.tar.gz
hostap-f19c907822ad0dec3480b1435b615ae22c5533a1.tar.bz2
OpenSSL: Implement aes_wrap() and aes_unwrap()
This replaces the implementation in aes-wrap.c and aes-unwrap.c with OpenSSL AES_wrap_key() and AES_unwrap_key() functions when building hostapd or wpa_supplicant with OpenSSL. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
Diffstat (limited to 'wpa_supplicant/Android.mk')
-rw-r--r--wpa_supplicant/Android.mk4
1 files changed, 4 insertions, 0 deletions
diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk
index 38041b6..579582b 100644
--- a/wpa_supplicant/Android.mk
+++ b/wpa_supplicant/Android.mk
@@ -1127,7 +1127,9 @@ ifdef CONFIG_INTERNAL_AES
AESOBJS += src/crypto/aes-internal.c src/crypto/aes-internal-dec.c
endif
+ifneq ($(CONFIG_TLS), openssl)
AESOBJS += src/crypto/aes-unwrap.c
+endif
ifdef NEED_AES_EAX
AESOBJS += src/crypto/aes-eax.c
NEED_AES_CTR=y
@@ -1148,8 +1150,10 @@ endif
endif
ifdef NEED_AES_WRAP
NEED_AES_ENC=y
+ifneq ($(CONFIG_TLS), openssl)
AESOBJS += src/crypto/aes-wrap.c
endif
+endif
ifdef NEED_AES_CBC
NEED_AES_ENC=y
AESOBJS += src/crypto/aes-cbc.c