aboutsummaryrefslogtreecommitdiffstats
path: root/wpa_supplicant
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2008-08-16 08:21:22 (GMT)
committerJouni Malinen <j@w1.fi>2008-08-16 08:21:22 (GMT)
commit1d8ce433c9491260005111812976ec0655ef1370 (patch)
tree60e5754c0d9931a90144edefa5d8aa7316a3eb64 /wpa_supplicant
parenta9141cffb0d80e52255e69cbb50fb9179d055786 (diff)
downloadhostap-1d8ce433c9491260005111812976ec0655ef1370.zip
hostap-1d8ce433c9491260005111812976ec0655ef1370.tar.gz
hostap-1d8ce433c9491260005111812976ec0655ef1370.tar.bz2
Internal X.509/TLSv1: Support SHA-256 in X.509 certificate digest
Diffstat (limited to 'wpa_supplicant')
-rw-r--r--wpa_supplicant/ChangeLog4
-rw-r--r--wpa_supplicant/Makefile12
2 files changed, 11 insertions, 5 deletions
diff --git a/wpa_supplicant/ChangeLog b/wpa_supplicant/ChangeLog
index 399bcd8..07dc0f0 100644
--- a/wpa_supplicant/ChangeLog
+++ b/wpa_supplicant/ChangeLog
@@ -1,5 +1,9 @@
ChangeLog for wpa_supplicant
+????-??-?? - v0.6.5
+ * added support for SHA-256 as X.509 certificate digest when using the
+ internal X.509/TLSv1 implementation
+
2008-08-10 - v0.6.4
* added support for EAP Sequences in EAP-FAST Phase 2
* added support for using TNC with EAP-FAST
diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile
index 7fd3fc5..9920f1b 100644
--- a/wpa_supplicant/Makefile
+++ b/wpa_supplicant/Makefile
@@ -776,8 +776,14 @@ ifdef CONFIG_IEEE80211R
NEED_SHA256=y
endif
+ifdef CONFIG_IEEE80211W
+CFLAGS += -DCONFIG_IEEE80211W
+NEED_SHA256=y
+endif
+
ifdef NEED_SHA256
OBJS += ../src/crypto/sha256.o
+CFLAGS += -DNEED_SHA256
endif
ifdef CONFIG_WIRELESS_EXTENSION
@@ -861,11 +867,6 @@ ifdef CONFIG_PEERKEY
CFLAGS += -DCONFIG_PEERKEY
endif
-ifdef CONFIG_IEEE80211W
-CFLAGS += -DCONFIG_IEEE80211W
-NEED_SHA256=y
-endif
-
ifdef CONFIG_IEEE80211R
CFLAGS += -DCONFIG_IEEE80211R
OBJS += ../src/rsn_supp/wpa_ft.o
@@ -1036,6 +1037,7 @@ OBJSx=tests/test_x509v3.o ../src/tls/asn1.o ../src/tls/x509v3.o \
../src/crypto/crypto_$(CONFIG_CRYPTO).o \
../src/crypto/md5.o ../src/crypto/sha1.o ../src/crypto/aes.o \
../src/crypto/rc4.o ../src/crypto/des.o ../src/crypto/aes_wrap.o \
+ ../src/crypto/sha256.o \
../src/tls/bignum.o ../src/tls/rsa.o
test_x509v3: $(OBJSx)
$(LDO) $(LDFLAGS) -o test_x509v3 $(OBJSx)