diff options
| author | Jouni Malinen <j@w1.fi> | 2017-12-27 21:35:26 (GMT) |
|---|---|---|
| committer | Jouni Malinen <j@w1.fi> | 2017-12-27 21:35:26 (GMT) |
| commit | 133f8d09fcef5461e70c3a81c7bf8124778591c6 (patch) | |
| tree | 12917df4f2fb0a94828b88cf0cd31b71ab6c2929 /wpa_supplicant | |
| parent | 85c12a62ee167946cecbc065f78d4bb674de16ca (diff) | |
| download | hostap-133f8d09fcef5461e70c3a81c7bf8124778591c6.zip hostap-133f8d09fcef5461e70c3a81c7bf8124778591c6.tar.gz hostap-133f8d09fcef5461e70c3a81c7bf8124778591c6.tar.bz2 | |
GnuTLS: Implement HMAC functions using libgcrypt
Replace the internal HMAC MD5, SHA-1, and SHA256 implementations with
the ones from libgcrypt and also add the SHA384 and SHA512 versions.
Signed-off-by: Jouni Malinen <j@w1.fi>
Diffstat (limited to 'wpa_supplicant')
| -rw-r--r-- | wpa_supplicant/Android.mk | 10 | ||||
| -rw-r--r-- | wpa_supplicant/Makefile | 10 |
2 files changed, 20 insertions, 0 deletions
diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk index ed3dd73..f632bbd 100644 --- a/wpa_supplicant/Android.mk +++ b/wpa_supplicant/Android.mk @@ -1240,8 +1240,10 @@ endif SHA1OBJS = ifdef NEED_SHA1 ifneq ($(CONFIG_TLS), openssl) +ifneq ($(CONFIG_TLS), gnutls) SHA1OBJS += src/crypto/sha1.c endif +endif SHA1OBJS += src/crypto/sha1-prf.c ifdef CONFIG_INTERNAL_SHA1 SHA1OBJS += src/crypto/sha1-internal.c @@ -1267,9 +1269,11 @@ endif MD5OBJS = ifndef CONFIG_FIPS ifneq ($(CONFIG_TLS), openssl) +ifneq ($(CONFIG_TLS), gnutls) MD5OBJS += src/crypto/md5.c endif endif +endif ifdef NEED_MD5 ifdef CONFIG_INTERNAL_MD5 MD5OBJS += src/crypto/md5-internal.c @@ -1307,8 +1311,10 @@ SHA256OBJS = # none by default ifdef NEED_SHA256 L_CFLAGS += -DCONFIG_SHA256 ifneq ($(CONFIG_TLS), openssl) +ifneq ($(CONFIG_TLS), gnutls) SHA256OBJS += src/crypto/sha256.c endif +endif SHA256OBJS += src/crypto/sha256-prf.c ifdef CONFIG_INTERNAL_SHA256 SHA256OBJS += src/crypto/sha256-internal.c @@ -1341,15 +1347,19 @@ endif ifdef NEED_SHA384 L_CFLAGS += -DCONFIG_SHA384 ifneq ($(CONFIG_TLS), openssl) +ifneq ($(CONFIG_TLS), gnutls) OBJS += src/crypto/sha384.c endif +endif OBJS += src/crypto/sha384-prf.c endif ifdef NEED_SHA512 L_CFLAGS += -DCONFIG_SHA512 ifneq ($(CONFIG_TLS), openssl) +ifneq ($(CONFIG_TLS), gnutls) OBJS += src/crypto/sha512.c endif +endif OBJS += src/crypto/sha512-prf.c endif diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile index e60a05c..443f5b3 100644 --- a/wpa_supplicant/Makefile +++ b/wpa_supplicant/Makefile @@ -1332,9 +1332,11 @@ endif ifdef NEED_SHA1 ifneq ($(CONFIG_TLS), openssl) ifneq ($(CONFIG_TLS), linux) +ifneq ($(CONFIG_TLS), gnutls) SHA1OBJS += ../src/crypto/sha1.o endif endif +endif SHA1OBJS += ../src/crypto/sha1-prf.o ifdef CONFIG_INTERNAL_SHA1 SHA1OBJS += ../src/crypto/sha1-internal.o @@ -1360,10 +1362,12 @@ endif ifndef CONFIG_FIPS ifneq ($(CONFIG_TLS), openssl) ifneq ($(CONFIG_TLS), linux) +ifneq ($(CONFIG_TLS), gnutls) MD5OBJS += ../src/crypto/md5.o endif endif endif +endif ifdef NEED_MD5 ifdef CONFIG_INTERNAL_MD5 MD5OBJS += ../src/crypto/md5-internal.o @@ -1403,9 +1407,11 @@ ifdef NEED_SHA256 CFLAGS += -DCONFIG_SHA256 ifneq ($(CONFIG_TLS), openssl) ifneq ($(CONFIG_TLS), linux) +ifneq ($(CONFIG_TLS), gnutls) SHA256OBJS += ../src/crypto/sha256.o endif endif +endif SHA256OBJS += ../src/crypto/sha256-prf.o ifdef CONFIG_INTERNAL_SHA256 SHA256OBJS += ../src/crypto/sha256-internal.o @@ -1438,18 +1444,22 @@ endif ifdef NEED_SHA384 ifneq ($(CONFIG_TLS), openssl) ifneq ($(CONFIG_TLS), linux) +ifneq ($(CONFIG_TLS), gnutls) OBJS += ../src/crypto/sha384.o endif endif +endif CFLAGS += -DCONFIG_SHA384 OBJS += ../src/crypto/sha384-prf.o endif ifdef NEED_SHA512 ifneq ($(CONFIG_TLS), openssl) ifneq ($(CONFIG_TLS), linux) +ifneq ($(CONFIG_TLS), gnutls) OBJS += ../src/crypto/sha512.o endif endif +endif CFLAGS += -DCONFIG_SHA512 OBJS += ../src/crypto/sha512-prf.o endif |