aboutsummaryrefslogtreecommitdiffstats
path: root/wpa_supplicant/Android.mk
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2012-08-16 17:13:02 (GMT)
committerJouni Malinen <j@w1.fi>2012-08-16 17:26:16 (GMT)
commite40c86ad27db8f9ea85814115841072c41453aea (patch)
treedefa2f4cdbcf73c04ce21ea9f48c2cbd8e4f9981 /wpa_supplicant/Android.mk
parent6e6909a97e0d94e0291db08daab1bc2f75ab3849 (diff)
downloadhostap-e40c86ad27db8f9ea85814115841072c41453aea.zip
hostap-e40c86ad27db8f9ea85814115841072c41453aea.tar.gz
hostap-e40c86ad27db8f9ea85814115841072c41453aea.tar.bz2
OpenSSL: Use library function for PBKDF2 passphrase-to-PSK
Use the OpenSSL PKCS5_PBKDF2_HMAC_SHA1() function instead of the internal implementation in sha1-pbkdf2.c. Signed-hostap: Jouni Malinen <j@w1.fi>
Diffstat (limited to 'wpa_supplicant/Android.mk')
-rw-r--r--wpa_supplicant/Android.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk
index c45a510..94a3d96 100644
--- a/wpa_supplicant/Android.mk
+++ b/wpa_supplicant/Android.mk
@@ -1064,8 +1064,10 @@ endif
ifdef CONFIG_NO_WPA_PASSPHRASE
L_CFLAGS += -DCONFIG_NO_PBKDF2
else
+ifneq ($(CONFIG_TLS), openssl)
SHA1OBJS += src/crypto/sha1-pbkdf2.c
endif
+endif
ifdef NEED_T_PRF
SHA1OBJS += src/crypto/sha1-tprf.c
endif