diff options
| author | Jouni Malinen <jouni@qca.qualcomm.com> | 2014-03-11 14:33:05 (GMT) |
|---|---|---|
| committer | Jouni Malinen <j@w1.fi> | 2014-03-11 14:44:22 (GMT) |
| commit | 09eef142eabb14d3f4242af7aafb909dd9cda9b8 (patch) | |
| tree | 6a35dcabc85904959a8cf0d4b37bb05a06a72371 /wpa_supplicant/Makefile | |
| parent | 9b3e2ad3a7bd8a4d1aeed97c3c6a216dcd741dc8 (diff) | |
| download | hostap-09eef142eabb14d3f4242af7aafb909dd9cda9b8.zip hostap-09eef142eabb14d3f4242af7aafb909dd9cda9b8.tar.gz hostap-09eef142eabb14d3f4242af7aafb909dd9cda9b8.tar.bz2 | |
Use internal FIPS 186-2 PRF if needed
Previously, EAP-SIM/AKA/AKA' did not work with number of crypto
libraries (GnuTLS, CryptoAPI, NSS) since the required FIPS 186-2 PRF
function was not implemented. This resulted in somewhat confusing error
messages since the placeholder functions were silently returning an
error. Fix this by using the internal implementation of FIP 186-2 PRF
(including internal SHA-1 implementation) with crypto libraries that do
not implement this in case EAP-SIM/AKA/AKA' is included in the build.
Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
Diffstat (limited to 'wpa_supplicant/Makefile')
| -rw-r--r-- | wpa_supplicant/Makefile | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile index 2b8cb93..ce98068 100644 --- a/wpa_supplicant/Makefile +++ b/wpa_supplicant/Makefile @@ -967,7 +967,8 @@ endif OBJS += ../src/crypto/crypto_gnutls.o OBJS_p += ../src/crypto/crypto_gnutls.o ifdef NEED_FIPS186_2_PRF -OBJS += ../src/crypto/fips_prf_gnutls.o +OBJS += ../src/crypto/fips_prf_internal.o +SHA1OBJS += ../src/crypto/sha1-internal.o endif LIBS += -lgcrypt LIBS_p += -lgcrypt @@ -983,7 +984,8 @@ endif OBJS += ../src/crypto/crypto_cryptoapi.o OBJS_p += ../src/crypto/crypto_cryptoapi.o ifdef NEED_FIPS186_2_PRF -OBJS += ../src/crypto/fips_prf_cryptoapi.o +OBJS += ../src/crypto/fips_prf_internal.o +SHA1OBJS += ../src/crypto/sha1-internal.o endif CONFIG_INTERNAL_SHA256=y CONFIG_INTERNAL_RC4=y @@ -998,7 +1000,8 @@ endif OBJS += ../src/crypto/crypto_nss.o OBJS_p += ../src/crypto/crypto_nss.o ifdef NEED_FIPS186_2_PRF -OBJS += ../src/crypto/fips_prf_nss.o +OBJS += ../src/crypto/fips_prf_internal.o +SHA1OBJS += ../src/crypto/sha1-internal.o endif LIBS += -lnss3 LIBS_p += -lnss3 |