DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Move test_x509v3 into the new tests subdirectory

Browse source
This commit is contained in:
Jouni Malinen 2009-12-06 18:10:52 +02:00
parent 6b282c3951
commit 655702f38d
6 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
tests/.gitignore vendored
View file

@ -8,3 +8,4 @@ test-ms_funcs
test-sha1 test-sha1
test-sha256 test-sha256
test-x509 test-x509
test-x509v3

7
tests/Makefile
View file

@ -1,5 +1,5 @@
TESTS=test-base64 test-md4 test-md5 test-milenage test-ms_funcs test-sha1 \ TESTS=test-base64 test-md4 test-md5 test-milenage test-ms_funcs test-sha1 \
test-sha256 test-aes test-asn1 test-x509 test-sha256 test-aes test-asn1 test-x509 test-x509v3
all: $(TESTS) all: $(TESTS)
@ -66,6 +66,9 @@ test-sha256: test-sha256.o $(LIBS)
test-x509: test-x509.o $(LIBS) test-x509: test-x509.o $(LIBS)
$(LDO) $(LDFLAGS) -o $@ $< $(LLIBS) $(LDO) $(LDFLAGS) -o $@ $< $(LLIBS)
test-x509v3: test-x509v3.o $(LIBS)
$(LDO) $(LDFLAGS) -o $@ $< $(LLIBS)
run-tests: $(TESTS) run-tests: $(TESTS)
./test-aes ./test-aes
@ -80,5 +83,7 @@ run-tests: $(TESTS)
clean: clean:
$(MAKE) -C ../src clean $(MAKE) -C ../src clean
rm -f $(TESTS) *~ *.o *.d rm -f $(TESTS) *~ *.o *.d
rm -f test_x509v3_nist.out.*
rm -f test_x509v3_nist2.out.*
-include $(OBJS:%.o=%.d) -include $(OBJS:%.o=%.d)

0
wpa_supplicant/tests/test_x509v3.c → tests/test-x509v3.c
View file

4
wpa_supplicant/tests/test_x509v3_nist.sh → tests/test_x509v3_nist.sh
View file

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
# X.509 Path Validation Test Suite, Version 1.07 # X.509 Path Validation Test Suite, Version 1.07
# http://csrc.nist.gov/pki/testing/x509paths_old.html # http://csrc.nist.gov/pki/testing/x509paths_old.html
@ -16,7 +16,7 @@ if [ ! -d $TESTS ]; then
exit 1 exit 1
fi fi
X509TEST="./test_x509v3 -v" X509TEST="./test-x509v3 -v"
TMPOUT=test_x509v3_nist.out TMPOUT=test_x509v3_nist.out
# TODO: add support for validating CRLs # TODO: add support for validating CRLs

6
wpa_supplicant/tests/test_x509v3_nist2.sh → tests/test_x509v3_nist2.sh
View file

@ -1,8 +1,8 @@
#!/bin/sh #!/bin/bash
# Public Key Interoperability Test Suite (PKITS) # Public Key Interoperability Test Suite (PKITS)
# http://csrc.nist.gov/pki/testing/x509paths.html # http://csrc.nist.gov/pki/testing/x509paths.html
# http://csrc.nist.gov/pki/testing/PKITS_data.zip # http://csrc.nist.gov/groups/ST/crypto_apps_infra/documents/PKITS_data.zip
if [ -z "$1" ]; then if [ -z "$1" ]; then
echo "usage: $0 <path to root test directory>" echo "usage: $0 <path to root test directory>"
@ -16,7 +16,7 @@ if [ ! -d $TESTS ]; then
exit 1 exit 1
fi fi
X509TEST="$PWD/test_x509v3 -v" X509TEST="$PWD/test-x509v3 -v"
TMPOUT="$PWD/test_x509v3_nist2.out" TMPOUT="$PWD/test_x509v3_nist2.out"
# TODO: add support for validating CRLs # TODO: add support for validating CRLs

9
wpa_supplicant/Makefile
View file

@ -1240,15 +1240,6 @@ link_test: $(OBJS) $(OBJS_h) tests/link_test.o
test_wpa: $(OBJS_wpa) $(OBJS_h) test_wpa: $(OBJS_wpa) $(OBJS_h)
$(LDO) $(LDFLAGS) -o test_wpa $(OBJS_wpa) $(LIBS) $(LDO) $(LDFLAGS) -o test_wpa $(OBJS_wpa) $(LIBS)
OBJSx=tests/test_x509v3.o ../src/tls/asn1.o ../src/tls/x509v3.o \
../src/utils/common.o ../src/utils/wpa_debug.o ../src/utils/os_unix.o \
../src/crypto/crypto_$(CONFIG_CRYPTO).o \
$(MD5OBJS) $(SHA1OBJS) $(AESOBJS) \
../src/crypto/rc4.o $(DESOBJS) $(SHA256OBJS) \
../src/tls/bignum.o ../src/tls/rsa.o
test_x509v3: $(OBJSx)
$(LDO) $(LDFLAGS) -o test_x509v3 $(OBJSx)
win_if_list: win_if_list.c win_if_list: win_if_list.c
$(LDO) $(LDFLAGS) -o $@ win_if_list.c $(CFLAGS) $(LIBS_w) $(LDO) $(LDFLAGS) -o $@ win_if_list.c $(CFLAGS) $(LIBS_w)