aboutsummaryrefslogtreecommitdiffstats
path: root/hostapd/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 /hostapd/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 'hostapd/Android.mk')
-rw-r--r--hostapd/Android.mk4
1 files changed, 4 insertions, 0 deletions
diff --git a/hostapd/Android.mk b/hostapd/Android.mk
index 17674f7..6fcefdd 100644
--- a/hostapd/Android.mk
+++ b/hostapd/Android.mk
@@ -675,7 +675,9 @@ ifdef CONFIG_INTERNAL_AES
AESOBJS += src/crypto/aes-internal.c src/crypto/aes-internal-enc.c
endif
+ifneq ($(CONFIG_TLS), openssl)
AESOBJS += src/crypto/aes-wrap.c
+endif
ifdef NEED_AES_EAX
AESOBJS += src/crypto/aes-eax.c
NEED_AES_CTR=y
@@ -690,9 +692,11 @@ ifdef NEED_AES_OMAC1
AESOBJS += src/crypto/aes-omac1.c
endif
ifdef NEED_AES_UNWRAP
+ifneq ($(CONFIG_TLS), openssl)
NEED_AES_DEC=y
AESOBJS += src/crypto/aes-unwrap.c
endif
+endif
ifdef NEED_AES_CBC
NEED_AES_DEC=y
AESOBJS += src/crypto/aes-cbc.c