aboutsummaryrefslogtreecommitdiffstats
path: root/hostapd
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2009-10-11 16:17:22 (GMT)
committerJouni Malinen <j@w1.fi>2009-10-11 16:17:22 (GMT)
commitf042122a57e093b076680f7b849de709b0357679 (patch)
tree27a91d968376f184d0f12f54b67135bcfc212b03 /hostapd
parentdd01b1ff9d8a19c1e1b7e40d6df7d838d2ac34bb (diff)
downloadhostap-f042122a57e093b076680f7b849de709b0357679.zip
hostap-f042122a57e093b076680f7b849de709b0357679.tar.gz
hostap-f042122a57e093b076680f7b849de709b0357679.tar.bz2
Allow the internal DH implementation to be overridden
Crypto library wrappers can now override the internal DH (group 5) implementation. As a starting point, this is done with OpenSSL. The new mechanism is currently available only for WPS (i.e., IKEv2 still depends on the internal DH implementation).
Diffstat (limited to 'hostapd')
-rw-r--r--hostapd/Makefile11
1 files changed, 11 insertions, 0 deletions
diff --git a/hostapd/Makefile b/hostapd/Makefile
index ab637c1..2e049de 100644
--- a/hostapd/Makefile
+++ b/hostapd/Makefile
@@ -449,6 +449,7 @@ OBJS_p += ../src/crypto/fips_prf_gnutls.o
endif
CONFIG_INTERNAL_SHA256=y
CONFIG_INTERNAL_RC4=y
+CONFIG_INTERNAL_DH_GROUP5=y
endif
ifeq ($(CONFIG_TLS), internal)
ifeq ($(CONFIG_CRYPTO), libtomcrypt)
@@ -456,6 +457,7 @@ OBJS += ../src/crypto/crypto_libtomcrypt.o
OBJS_p += ../src/crypto/crypto_libtomcrypt.o
CONFIG_INTERNAL_SHA256=y
CONFIG_INTERNAL_RC4=y
+CONFIG_INTERNAL_DH_GROUP5=y
endif
ifeq ($(CONFIG_CRYPTO), internal)
OBJS += ../src/crypto/crypto_internal.o ../src/tls/rsa.o ../src/tls/bignum.o
@@ -477,6 +479,7 @@ CONFIG_INTERNAL_MD4=y
CONFIG_INTERNAL_MD5=y
CONFIG_INTERNAL_SHA256=y
CONFIG_INTERNAL_RC4=y
+CONFIG_INTERNAL_DH_GROUP5=y
endif
endif
else
@@ -516,12 +519,20 @@ OBJS += ../src/crypto/sha256-internal.o
endif
endif
+ifdef CONFIG_INTERNAL_DH_GROUP5
ifdef NEED_DH_GROUPS
OBJS += ../src/crypto/dh_groups.o
+OBJS += ../src/crypto/dh_group5.o
ifdef NEED_DH_GROUPS_ALL
CFLAGS += -DALL_DH_GROUPS
endif
endif
+else
+ifdef NEED_DH_GROUPS_ALL
+OBJS += ../src/crypto/dh_groups.o
+CFLAGS += -DALL_DH_GROUPS
+endif
+endif
ifdef NEED_T_PRF
SHA1OBJS += ../src/crypto/sha1-tprf.o