summaryrefslogtreecommitdiff
path: root/src/lib/libssl/test
diff options
context:
space:
mode:
authorbeck <>2002-05-15 02:29:21 +0000
committerbeck <>2002-05-15 02:29:21 +0000
commitb64270d1e45fe7f3241e4c9b6ce60d5ac89bc2e9 (patch)
treefa27cf82a1250b64ed3bf5f4a18c7354d470bbcc /src/lib/libssl/test
parente471e1ea98d673597b182ea85f29e30c97cd08b5 (diff)
downloadopenbsd-b64270d1e45fe7f3241e4c9b6ce60d5ac89bc2e9.tar.gz
openbsd-b64270d1e45fe7f3241e4c9b6ce60d5ac89bc2e9.tar.bz2
openbsd-b64270d1e45fe7f3241e4c9b6ce60d5ac89bc2e9.zip
OpenSSL 0.9.7 stable 2002 05 08 merge
Diffstat (limited to 'src/lib/libssl/test')
-rw-r--r--src/lib/libssl/test/Makefile.ssl320
-rw-r--r--src/lib/libssl/test/maketests.com44
-rw-r--r--src/lib/libssl/test/tests.com31
-rw-r--r--src/lib/libssl/test/testss15
-rw-r--r--src/lib/libssl/test/testssl120
-rw-r--r--src/lib/libssl/test/tmp.bctest2
6 files changed, 350 insertions, 182 deletions
diff --git a/src/lib/libssl/test/Makefile.ssl b/src/lib/libssl/test/Makefile.ssl
index 7384243cbd..a11e3dfcd7 100644
--- a/src/lib/libssl/test/Makefile.ssl
+++ b/src/lib/libssl/test/Makefile.ssl
@@ -5,14 +5,15 @@
5DIR= test 5DIR= test
6TOP= .. 6TOP= ..
7CC= cc 7CC= cc
8INCLUDES= -I../include 8INCLUDES= -I$(TOP) -I../include $(KRB5_INCLUDES)
9CFLAG= -g 9CFLAG= -g
10INSTALL_PREFIX= 10INSTALL_PREFIX=
11OPENSSLDIR= /usr/local/ssl 11OPENSSLDIR= /usr/local/ssl
12INSTALLTOP= /usr/local/ssl 12INSTALLTOP= /usr/local/ssl
13MAKEFILE= Makefile.ssl 13MAKEFILE= Makefile.ssl
14MAKE= make -f $(MAKEFILE) 14MAKE= make -f $(MAKEFILE)
15MAKEDEPEND= $(TOP)/util/domd $(TOP) 15MAKEDEPPROG= makedepend
16MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
16PERL= perl 17PERL= perl
17 18
18PEX_LIBS= 19PEX_LIBS=
@@ -31,6 +32,7 @@ LIBCRYPTO= -L.. -lcrypto
31LIBSSL= -L.. -lssl 32LIBSSL= -L.. -lssl
32 33
33BNTEST= bntest 34BNTEST= bntest
35ECTEST= ectest
34EXPTEST= exptest 36EXPTEST= exptest
35IDEATEST= ideatest 37IDEATEST= ideatest
36SHATEST= shatest 38SHATEST= shatest
@@ -54,27 +56,33 @@ METHTEST= methtest
54SSLTEST= ssltest 56SSLTEST= ssltest
55RSATEST= rsa_test 57RSATEST= rsa_test
56ENGINETEST= enginetest 58ENGINETEST= enginetest
59EVPTEST= evp_test
57 60
58EXE= $(BNTEST) $(IDEATEST) $(MD2TEST) $(MD4TEST) $(MD5TEST) $(HMACTEST) \ 61TESTS= alltests
62
63EXE= $(BNTEST) $(ECTEST) $(IDEATEST) $(MD2TEST) $(MD4TEST) $(MD5TEST) $(HMACTEST) \
59 $(RC2TEST) $(RC4TEST) $(RC5TEST) \ 64 $(RC2TEST) $(RC4TEST) $(RC5TEST) \
60 $(DESTEST) $(SHATEST) $(SHA1TEST) $(MDC2TEST) $(RMDTEST) \ 65 $(DESTEST) $(SHATEST) $(SHA1TEST) $(MDC2TEST) $(RMDTEST) \
61 $(RANDTEST) $(DHTEST) $(ENGINETEST) \ 66 $(RANDTEST) $(DHTEST) $(ENGINETEST) \
62 $(BFTEST) $(CASTTEST) $(SSLTEST) $(EXPTEST) $(DSATEST) $(RSATEST) 67 $(BFTEST) $(CASTTEST) $(SSLTEST) $(EXPTEST) $(DSATEST) $(RSATEST) \
68 $(EVPTEST)
63 69
64# $(METHTEST) 70# $(METHTEST)
65 71
66OBJ= $(BNTEST).o $(IDEATEST).o $(MD2TEST).o $(MD4TEST).o $(MD5TEST).o \ 72OBJ= $(BNTEST).o $(ECTEST).o $(IDEATEST).o $(MD2TEST).o $(MD4TEST).o $(MD5TEST).o \
67 $(HMACTEST).o \ 73 $(HMACTEST).o \
68 $(RC2TEST).o $(RC4TEST).o $(RC5TEST).o \ 74 $(RC2TEST).o $(RC4TEST).o $(RC5TEST).o \
69 $(DESTEST).o $(SHATEST).o $(SHA1TEST).o $(MDC2TEST).o $(RMDTEST).o \ 75 $(DESTEST).o $(SHATEST).o $(SHA1TEST).o $(MDC2TEST).o $(RMDTEST).o \
70 $(RANDTEST).o $(DHTEST).o $(ENGINETEST).o $(CASTTEST).o \ 76 $(RANDTEST).o $(DHTEST).o $(ENGINETEST).o $(CASTTEST).o \
71 $(BFTEST).o $(SSLTEST).o $(DSATEST).o $(EXPTEST).o $(RSATEST).o 77 $(BFTEST).o $(SSLTEST).o $(DSATEST).o $(EXPTEST).o $(RSATEST).o \
72SRC= $(BNTEST).c $(IDEATEST).c $(MD2TEST).c $(MD4TEST).c $(MD5TEST).c \ 78 $(EVPTEST).o
79SRC= $(BNTEST).c $(ECTEST).c $(IDEATEST).c $(MD2TEST).c $(MD4TEST).c $(MD5TEST).c \
73 $(HMACTEST).c \ 80 $(HMACTEST).c \
74 $(RC2TEST).c $(RC4TEST).c $(RC5TEST).c \ 81 $(RC2TEST).c $(RC4TEST).c $(RC5TEST).c \
75 $(DESTEST).c $(SHATEST).c $(SHA1TEST).c $(MDC2TEST).c $(RMDTEST).c \ 82 $(DESTEST).c $(SHATEST).c $(SHA1TEST).c $(MDC2TEST).c $(RMDTEST).c \
76 $(RANDTEST).c $(DHTEST).c $(ENGINETEST).c $(CASTTEST).c \ 83 $(RANDTEST).c $(DHTEST).c $(ENGINETEST).c $(CASTTEST).c \
77 $(BFTEST).c $(SSLTEST).c $(DSATEST).c $(EXPTEST).c $(RSATEST).c 84 $(BFTEST).c $(SSLTEST).c $(DSATEST).c $(EXPTEST).c $(RSATEST).c \
85 $(EVPTEST).c
78 86
79EXHEADER= 87EXHEADER=
80HEADER= $(EXHEADER) 88HEADER= $(EXHEADER)
@@ -82,7 +90,7 @@ HEADER= $(EXHEADER)
82ALL= $(GENERAL) $(SRC) $(HEADER) 90ALL= $(GENERAL) $(SRC) $(HEADER)
83 91
84top: 92top:
85 (cd ..; $(MAKE) DIRS=$(DIR) all) 93 (cd ..; $(MAKE) DIRS=$(DIR) TESTS=$(TESTS) all)
86 94
87all: exe 95all: exe
88 96
@@ -101,16 +109,25 @@ install:
101tags: 109tags:
102 ctags $(SRC) 110 ctags $(SRC)
103 111
104tests: exe apps \ 112tests: exe apps $(TESTS)
113
114apps:
115 @(cd ../apps; $(MAKE) CC='${CC}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' all)
116
117alltests:
118 (LIBPATH="`cd ..; pwd`"; LD_LIBRARY_PATH=$$LIBPATH; SHLIB_PATH=$$LIBPATH; \
119 export LD_LIBRARY_PATH SHLIB_PATH LIBPATH; \
120 $(MAKE) CC='${CC}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' alltests.chooser)
121alltests.chooser: \
105 test_des test_idea test_sha test_md4 test_md5 test_hmac \ 122 test_des test_idea test_sha test_md4 test_md5 test_hmac \
106 test_md2 test_mdc2 \ 123 test_md2 test_mdc2 \
107 test_rmd test_rc2 test_rc4 test_rc5 test_bf test_cast \ 124 test_rmd test_rc2 test_rc4 test_rc5 test_bf test_cast test_rd \
108 test_rand test_bn test_enc test_x509 test_rsa test_crl test_sid \ 125 test_rand test_bn test_ec test_enc test_x509 test_rsa test_crl test_sid \
109 test_gen test_req test_pkcs7 test_verify test_dh test_dsa \ 126 test_gen test_req test_pkcs7 test_verify test_dh test_dsa \
110 test_ss test_ca test_engine test_ssl 127 test_ss test_ca test_engine test_evp test_ssl
111 128
112apps: 129test_evp:
113 @(cd ../apps; $(MAKE) CC='${CC}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' all) 130 ./$(EVPTEST) evptests.txt
114 131
115test_des: 132test_des:
116 ./$(DESTEST) 133 ./$(DESTEST)
@@ -196,6 +213,10 @@ test_bn:
196 @echo 'test a^b%c implementations' 213 @echo 'test a^b%c implementations'
197 ./$(EXPTEST) 214 ./$(EXPTEST)
198 215
216test_ec:
217 @echo 'test elliptic curves'
218 ./$(ECTEST)
219
199test_verify: 220test_verify:
200 @echo "The following command should have some OK's and some failures" 221 @echo "The following command should have some OK's and some failures"
201 @echo "There are definitly a few expired certificates" 222 @echo "There are definitly a few expired certificates"
@@ -230,6 +251,10 @@ test_ca:
230 @echo "Generate and certify a test certificate via the 'ca' program" 251 @echo "Generate and certify a test certificate via the 'ca' program"
231 @sh ./testca 252 @sh ./testca
232 253
254test_rd: #$(RDTEST)
255# @echo "test Rijndael"
256# ./$(RDTEST)
257
233lint: 258lint:
234 lint -DLINT $(INCLUDES) $(SRC)>fluff 259 lint -DLINT $(INCLUDES) $(SRC)>fluff
235 260
@@ -241,7 +266,7 @@ dclean:
241 mv -f Makefile.new $(MAKEFILE) 266 mv -f Makefile.new $(MAKEFILE)
242 267
243clean: 268clean:
244 rm -f .rnd tmp.bntest tmp.bctest *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff $(EXE) *.ss log 269 rm -f .rnd tmp.bntest tmp.bctest *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff $(EXE) *.ss *.srl log
245 270
246$(DLIBSSL): 271$(DLIBSSL):
247 (cd ../ssl; $(MAKE)) 272 (cd ../ssl; $(MAKE))
@@ -255,6 +280,9 @@ $(RSATEST): $(RSATEST).o $(DLIBCRYPTO)
255$(BNTEST): $(BNTEST).o $(DLIBCRYPTO) 280$(BNTEST): $(BNTEST).o $(DLIBCRYPTO)
256 $(CC) -o $(BNTEST) $(CFLAGS) $(BNTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS) 281 $(CC) -o $(BNTEST) $(CFLAGS) $(BNTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
257 282
283$(ECTEST): $(ECTEST).o $(DLIBCRYPTO)
284 $(CC) -o $(ECTEST) $(CFLAGS) $(ECTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
285
258$(EXPTEST): $(EXPTEST).o $(DLIBCRYPTO) 286$(EXPTEST): $(EXPTEST).o $(DLIBCRYPTO)
259 $(CC) -o $(EXPTEST) $(CFLAGS) $(EXPTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS) 287 $(CC) -o $(EXPTEST) $(CFLAGS) $(EXPTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
260 288
@@ -316,126 +344,198 @@ $(METHTEST): $(METHTEST).o $(DLIBCRYPTO)
316 $(CC) -o $(METHTEST) $(CFLAGS) $(METHTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS) 344 $(CC) -o $(METHTEST) $(CFLAGS) $(METHTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
317 345
318$(SSLTEST): $(SSLTEST).o $(DLIBSSL) $(DLIBCRYPTO) 346$(SSLTEST): $(SSLTEST).o $(DLIBSSL) $(DLIBCRYPTO)
319 $(CC) -o $(SSLTEST) $(CFLAGS) $(SSLTEST).o $(PEX_LIBS) $(LIBSSL) $(LIBCRYPTO) $(EX_LIBS) 347 $(CC) -o $(SSLTEST) $(CFLAGS) $(SSLTEST).o $(PEX_LIBS) $(LIBSSL) $(LIBKRB5) $(LIBCRYPTO) $(EX_LIBS)
320 348
321$(ENGINETEST): $(ENGINETEST).o $(DLIBCRYPTO) 349$(ENGINETEST): $(ENGINETEST).o $(DLIBCRYPTO)
322 $(CC) -o $(ENGINETEST) $(CFLAGS) $(ENGINETEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS) 350 $(CC) -o $(ENGINETEST) $(CFLAGS) $(ENGINETEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
323 351
352$(EVPTEST): $(EVPTEST).o $(DLIBCRYPTO)
353 $(CC) -o $(EVPTEST) $(CFLAGS) $(EVPTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
354
355#$(RDTEST).o: $(RDTEST).c
356# $(CC) -c $(CFLAGS) -DINTERMEDIATE_VALUE_KAT -DTRACE_KAT_MCT $(RDTEST).c
357
358#$(RDTEST): $(RDTEST).o $(DLIBCRYPTO)
359# $(CC) -o $(RDTEST) $(CFLAGS) $(RDTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
360
324# DO NOT DELETE THIS LINE -- make depend depends on it. 361# DO NOT DELETE THIS LINE -- make depend depends on it.
325 362
326bftest.o: ../include/openssl/blowfish.h 363bftest.o: ../include/openssl/blowfish.h ../include/openssl/e_os2.h
327bntest.o: ../include/openssl/asn1.h ../include/openssl/bio.h 364bftest.o: ../include/openssl/opensslconf.h bftest.c
328bntest.o: ../include/openssl/blowfish.h ../include/openssl/bn.h 365bntest.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
329bntest.o: ../include/openssl/buffer.h ../include/openssl/cast.h 366bntest.o: ../include/openssl/bn.h ../include/openssl/buffer.h
330bntest.o: ../include/openssl/crypto.h ../include/openssl/des.h 367bntest.o: ../include/openssl/crypto.h ../include/openssl/dh.h
331bntest.o: ../include/openssl/dh.h ../include/openssl/dsa.h 368bntest.o: ../include/openssl/dsa.h ../include/openssl/e_os2.h
332bntest.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
333bntest.o: ../include/openssl/err.h ../include/openssl/evp.h 369bntest.o: ../include/openssl/err.h ../include/openssl/evp.h
334bntest.o: ../include/openssl/idea.h ../include/openssl/lhash.h 370bntest.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
335bntest.o: ../include/openssl/md2.h ../include/openssl/md4.h 371bntest.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
336bntest.o: ../include/openssl/md5.h ../include/openssl/mdc2.h 372bntest.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
337bntest.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
338bntest.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
339bntest.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h 373bntest.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
340bntest.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
341bntest.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
342bntest.o: ../include/openssl/rsa.h ../include/openssl/safestack.h 374bntest.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
343bntest.o: ../include/openssl/sha.h ../include/openssl/stack.h 375bntest.o: ../include/openssl/sha.h ../include/openssl/stack.h
344bntest.o: ../include/openssl/symhacks.h ../include/openssl/x509.h 376bntest.o: ../include/openssl/symhacks.h ../include/openssl/x509.h
345bntest.o: ../include/openssl/x509_vfy.h 377bntest.o: ../include/openssl/x509_vfy.h bntest.c
346casttest.o: ../include/openssl/cast.h 378casttest.o: ../include/openssl/cast.h casttest.c
347destest.o: ../include/openssl/des.h ../include/openssl/e_os2.h 379destest.o: ../include/openssl/crypto.h ../include/openssl/des.h
348destest.o: ../include/openssl/opensslconf.h 380destest.o: ../include/openssl/des_old.h ../include/openssl/e_os2.h
381destest.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
382destest.o: ../include/openssl/safestack.h ../include/openssl/stack.h
383destest.o: ../include/openssl/symhacks.h ../include/openssl/ui.h
384destest.o: ../include/openssl/ui_compat.h destest.c
349dhtest.o: ../include/openssl/bio.h ../include/openssl/bn.h 385dhtest.o: ../include/openssl/bio.h ../include/openssl/bn.h
350dhtest.o: ../include/openssl/crypto.h ../include/openssl/dh.h 386dhtest.o: ../include/openssl/crypto.h ../include/openssl/dh.h
351dhtest.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h 387dhtest.o: ../include/openssl/e_os2.h ../include/openssl/err.h
388dhtest.o: ../include/openssl/lhash.h ../include/openssl/opensslconf.h
389dhtest.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
352dhtest.o: ../include/openssl/rand.h ../include/openssl/safestack.h 390dhtest.o: ../include/openssl/rand.h ../include/openssl/safestack.h
353dhtest.o: ../include/openssl/stack.h ../include/openssl/symhacks.h 391dhtest.o: ../include/openssl/stack.h ../include/openssl/symhacks.h dhtest.c
354dsatest.o: ../include/openssl/bio.h ../include/openssl/bn.h 392dsatest.o: ../include/openssl/asn1.h ../include/openssl/bio.h
355dsatest.o: ../include/openssl/crypto.h ../include/openssl/dh.h 393dsatest.o: ../include/openssl/bn.h ../include/openssl/crypto.h
356dsatest.o: ../include/openssl/dsa.h ../include/openssl/err.h 394dsatest.o: ../include/openssl/dh.h ../include/openssl/dsa.h
357dsatest.o: ../include/openssl/lhash.h ../include/openssl/opensslconf.h 395dsatest.o: ../include/openssl/e_os2.h ../include/openssl/engine.h
358dsatest.o: ../include/openssl/opensslv.h ../include/openssl/rand.h 396dsatest.o: ../include/openssl/err.h ../include/openssl/lhash.h
359dsatest.o: ../include/openssl/safestack.h ../include/openssl/stack.h 397dsatest.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
360dsatest.o: ../include/openssl/symhacks.h 398dsatest.o: ../include/openssl/ossl_typ.h ../include/openssl/rand.h
399dsatest.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
400dsatest.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
401dsatest.o: ../include/openssl/ui.h dsatest.c
402ectest.o: ../include/openssl/asn1.h ../include/openssl/bio.h
403ectest.o: ../include/openssl/bn.h ../include/openssl/crypto.h
404ectest.o: ../include/openssl/dh.h ../include/openssl/dsa.h
405ectest.o: ../include/openssl/e_os2.h ../include/openssl/ec.h
406ectest.o: ../include/openssl/engine.h ../include/openssl/err.h
407ectest.o: ../include/openssl/lhash.h ../include/openssl/opensslconf.h
408ectest.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
409ectest.o: ../include/openssl/rand.h ../include/openssl/rsa.h
410ectest.o: ../include/openssl/safestack.h ../include/openssl/stack.h
411ectest.o: ../include/openssl/symhacks.h ../include/openssl/ui.h ectest.c
361enginetest.o: ../include/openssl/asn1.h ../include/openssl/bio.h 412enginetest.o: ../include/openssl/asn1.h ../include/openssl/bio.h
362enginetest.o: ../include/openssl/blowfish.h ../include/openssl/bn.h 413enginetest.o: ../include/openssl/bn.h ../include/openssl/buffer.h
363enginetest.o: ../include/openssl/cast.h ../include/openssl/crypto.h 414enginetest.o: ../include/openssl/crypto.h ../include/openssl/dh.h
364enginetest.o: ../include/openssl/des.h ../include/openssl/dh.h
365enginetest.o: ../include/openssl/dsa.h ../include/openssl/e_os2.h 415enginetest.o: ../include/openssl/dsa.h ../include/openssl/e_os2.h
366enginetest.o: ../include/openssl/engine.h ../include/openssl/err.h 416enginetest.o: ../include/openssl/engine.h ../include/openssl/err.h
367enginetest.o: ../include/openssl/evp.h ../include/openssl/idea.h 417enginetest.o: ../include/openssl/lhash.h ../include/openssl/opensslconf.h
368enginetest.o: ../include/openssl/lhash.h ../include/openssl/md2.h 418enginetest.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
369enginetest.o: ../include/openssl/md4.h ../include/openssl/md5.h 419enginetest.o: ../include/openssl/rand.h ../include/openssl/rsa.h
370enginetest.o: ../include/openssl/mdc2.h ../include/openssl/obj_mac.h 420enginetest.o: ../include/openssl/safestack.h ../include/openssl/stack.h
371enginetest.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h 421enginetest.o: ../include/openssl/symhacks.h ../include/openssl/ui.h
372enginetest.o: ../include/openssl/opensslv.h ../include/openssl/rand.h 422enginetest.o: enginetest.c
373enginetest.o: ../include/openssl/rc2.h ../include/openssl/rc4.h 423evp_test.o: ../include/openssl/asn1.h ../include/openssl/bio.h
374enginetest.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h 424evp_test.o: ../include/openssl/bn.h ../include/openssl/conf.h
375enginetest.o: ../include/openssl/rsa.h ../include/openssl/safestack.h 425evp_test.o: ../include/openssl/crypto.h ../include/openssl/dh.h
376enginetest.o: ../include/openssl/sha.h ../include/openssl/stack.h 426evp_test.o: ../include/openssl/dsa.h ../include/openssl/e_os2.h
377enginetest.o: ../include/openssl/symhacks.h 427evp_test.o: ../include/openssl/engine.h ../include/openssl/err.h
428evp_test.o: ../include/openssl/evp.h ../include/openssl/lhash.h
429evp_test.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
430evp_test.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
431evp_test.o: ../include/openssl/ossl_typ.h ../include/openssl/rand.h
432evp_test.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
433evp_test.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
434evp_test.o: ../include/openssl/ui.h evp_test.c
378exptest.o: ../include/openssl/bio.h ../include/openssl/bn.h 435exptest.o: ../include/openssl/bio.h ../include/openssl/bn.h
379exptest.o: ../include/openssl/crypto.h ../include/openssl/err.h 436exptest.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
380exptest.o: ../include/openssl/lhash.h ../include/openssl/opensslconf.h 437exptest.o: ../include/openssl/err.h ../include/openssl/lhash.h
381exptest.o: ../include/openssl/opensslv.h ../include/openssl/rand.h 438exptest.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
439exptest.o: ../include/openssl/ossl_typ.h ../include/openssl/rand.h
382exptest.o: ../include/openssl/safestack.h ../include/openssl/stack.h 440exptest.o: ../include/openssl/safestack.h ../include/openssl/stack.h
383exptest.o: ../include/openssl/symhacks.h 441exptest.o: ../include/openssl/symhacks.h exptest.c
384hmactest.o: ../include/openssl/asn1.h ../include/openssl/bio.h 442hmactest.o: ../include/openssl/asn1.h ../include/openssl/bio.h
385hmactest.o: ../include/openssl/blowfish.h ../include/openssl/bn.h 443hmactest.o: ../include/openssl/bn.h ../include/openssl/crypto.h
386hmactest.o: ../include/openssl/cast.h ../include/openssl/crypto.h 444hmactest.o: ../include/openssl/e_os2.h ../include/openssl/evp.h
387hmactest.o: ../include/openssl/des.h ../include/openssl/dh.h 445hmactest.o: ../include/openssl/hmac.h ../include/openssl/md5.h
388hmactest.o: ../include/openssl/dsa.h ../include/openssl/e_os2.h 446hmactest.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
389hmactest.o: ../include/openssl/evp.h ../include/openssl/hmac.h 447hmactest.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
390hmactest.o: ../include/openssl/idea.h ../include/openssl/md2.h 448hmactest.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h
391hmactest.o: ../include/openssl/md4.h ../include/openssl/md5.h 449hmactest.o: ../include/openssl/stack.h ../include/openssl/symhacks.h hmactest.c
392hmactest.o: ../include/openssl/mdc2.h ../include/openssl/obj_mac.h
393hmactest.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
394hmactest.o: ../include/openssl/opensslv.h ../include/openssl/rc2.h
395hmactest.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
396hmactest.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
397hmactest.o: ../include/openssl/safestack.h ../include/openssl/sha.h
398hmactest.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
399ideatest.o: ../include/openssl/idea.h ../include/openssl/opensslconf.h 450ideatest.o: ../include/openssl/idea.h ../include/openssl/opensslconf.h
400md2test.o: ../include/openssl/md2.h ../include/openssl/opensslconf.h 451ideatest.o: ideatest.c
401md4test.o: ../include/openssl/md4.h 452md2test.o: ../include/openssl/asn1.h ../include/openssl/bio.h
402md5test.o: ../include/openssl/md5.h 453md2test.o: ../include/openssl/bn.h ../include/openssl/crypto.h
403mdc2test.o: ../include/openssl/des.h ../include/openssl/e_os2.h 454md2test.o: ../include/openssl/e_os2.h ../include/openssl/evp.h
404mdc2test.o: ../include/openssl/mdc2.h ../include/openssl/opensslconf.h 455md2test.o: ../include/openssl/md2.h ../include/openssl/obj_mac.h
405randtest.o: ../include/openssl/rand.h 456md2test.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
406rc2test.o: ../include/openssl/opensslconf.h ../include/openssl/rc2.h 457md2test.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
407rc4test.o: ../include/openssl/opensslconf.h ../include/openssl/rc4.h 458md2test.o: ../include/openssl/safestack.h ../include/openssl/stack.h
408rc5test.o: ../include/openssl/rc5.h 459md2test.o: ../include/openssl/symhacks.h md2test.c
409rmdtest.o: ../include/openssl/ripemd.h 460md4test.o: ../include/openssl/asn1.h ../include/openssl/bio.h
410rsa_test.o: ../include/openssl/bio.h ../include/openssl/bn.h 461md4test.o: ../include/openssl/bn.h ../include/openssl/crypto.h
411rsa_test.o: ../include/openssl/crypto.h ../include/openssl/e_os.h 462md4test.o: ../include/openssl/e_os2.h ../include/openssl/evp.h
412rsa_test.o: ../include/openssl/e_os2.h ../include/openssl/err.h 463md4test.o: ../include/openssl/md4.h ../include/openssl/obj_mac.h
413rsa_test.o: ../include/openssl/lhash.h ../include/openssl/opensslconf.h 464md4test.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
414rsa_test.o: ../include/openssl/opensslv.h ../include/openssl/rand.h 465md4test.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
466md4test.o: ../include/openssl/safestack.h ../include/openssl/stack.h
467md4test.o: ../include/openssl/symhacks.h md4test.c
468md5test.o: ../include/openssl/asn1.h ../include/openssl/bio.h
469md5test.o: ../include/openssl/bn.h ../include/openssl/crypto.h
470md5test.o: ../include/openssl/e_os2.h ../include/openssl/evp.h
471md5test.o: ../include/openssl/md5.h ../include/openssl/obj_mac.h
472md5test.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
473md5test.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
474md5test.o: ../include/openssl/safestack.h ../include/openssl/stack.h
475md5test.o: ../include/openssl/symhacks.h md5test.c
476mdc2test.o: ../include/openssl/asn1.h ../include/openssl/bio.h
477mdc2test.o: ../include/openssl/bn.h ../include/openssl/crypto.h
478mdc2test.o: ../include/openssl/des.h ../include/openssl/des_old.h
479mdc2test.o: ../include/openssl/e_os2.h ../include/openssl/evp.h
480mdc2test.o: ../include/openssl/mdc2.h ../include/openssl/obj_mac.h
481mdc2test.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
482mdc2test.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
483mdc2test.o: ../include/openssl/safestack.h ../include/openssl/stack.h
484mdc2test.o: ../include/openssl/symhacks.h ../include/openssl/ui.h
485mdc2test.o: ../include/openssl/ui_compat.h mdc2test.c
486randtest.o: ../include/openssl/ossl_typ.h ../include/openssl/rand.h randtest.c
487rc2test.o: ../include/openssl/opensslconf.h ../include/openssl/rc2.h rc2test.c
488rc4test.o: ../include/openssl/opensslconf.h ../include/openssl/rc4.h rc4test.c
489rc5test.o: ../include/openssl/rc5.h rc5test.c
490rmdtest.o: ../include/openssl/asn1.h ../include/openssl/bio.h
491rmdtest.o: ../include/openssl/bn.h ../include/openssl/crypto.h
492rmdtest.o: ../include/openssl/e_os2.h ../include/openssl/evp.h
493rmdtest.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
494rmdtest.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
495rmdtest.o: ../include/openssl/ossl_typ.h ../include/openssl/ripemd.h
496rmdtest.o: ../include/openssl/safestack.h ../include/openssl/stack.h
497rmdtest.o: ../include/openssl/symhacks.h rmdtest.c
498rsa_test.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
499rsa_test.o: ../include/openssl/bn.h ../include/openssl/crypto.h
500rsa_test.o: ../include/openssl/dh.h ../include/openssl/dsa.h
501rsa_test.o: ../include/openssl/e_os2.h ../include/openssl/engine.h
502rsa_test.o: ../include/openssl/err.h ../include/openssl/lhash.h
503rsa_test.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
504rsa_test.o: ../include/openssl/ossl_typ.h ../include/openssl/rand.h
415rsa_test.o: ../include/openssl/rsa.h ../include/openssl/safestack.h 505rsa_test.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
416rsa_test.o: ../include/openssl/stack.h ../include/openssl/symhacks.h 506rsa_test.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
417sha1test.o: ../include/openssl/sha.h 507rsa_test.o: ../include/openssl/ui.h rsa_test.c
418shatest.o: ../include/openssl/sha.h 508sha1test.o: ../include/openssl/asn1.h ../include/openssl/bio.h
419ssltest.o: ../include/openssl/asn1.h ../include/openssl/bio.h 509sha1test.o: ../include/openssl/bn.h ../include/openssl/crypto.h
420ssltest.o: ../include/openssl/blowfish.h ../include/openssl/bn.h 510sha1test.o: ../include/openssl/e_os2.h ../include/openssl/evp.h
421ssltest.o: ../include/openssl/buffer.h ../include/openssl/cast.h 511sha1test.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
512sha1test.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
513sha1test.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h
514sha1test.o: ../include/openssl/sha.h ../include/openssl/stack.h
515sha1test.o: ../include/openssl/symhacks.h sha1test.c
516shatest.o: ../include/openssl/asn1.h ../include/openssl/bio.h
517shatest.o: ../include/openssl/bn.h ../include/openssl/crypto.h
518shatest.o: ../include/openssl/e_os2.h ../include/openssl/evp.h
519shatest.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
520shatest.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
521shatest.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h
522shatest.o: ../include/openssl/sha.h ../include/openssl/stack.h
523shatest.o: ../include/openssl/symhacks.h shatest.c
524ssltest.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
525ssltest.o: ../include/openssl/bn.h ../include/openssl/buffer.h
422ssltest.o: ../include/openssl/comp.h ../include/openssl/crypto.h 526ssltest.o: ../include/openssl/comp.h ../include/openssl/crypto.h
423ssltest.o: ../include/openssl/des.h ../include/openssl/dh.h 527ssltest.o: ../include/openssl/dh.h ../include/openssl/dsa.h
424ssltest.o: ../include/openssl/dsa.h ../include/openssl/e_os.h 528ssltest.o: ../include/openssl/e_os2.h ../include/openssl/engine.h
425ssltest.o: ../include/openssl/e_os2.h ../include/openssl/err.h 529ssltest.o: ../include/openssl/err.h ../include/openssl/evp.h
426ssltest.o: ../include/openssl/evp.h ../include/openssl/idea.h 530ssltest.o: ../include/openssl/kssl.h ../include/openssl/lhash.h
427ssltest.o: ../include/openssl/lhash.h ../include/openssl/md2.h 531ssltest.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
428ssltest.o: ../include/openssl/md4.h ../include/openssl/md5.h 532ssltest.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
429ssltest.o: ../include/openssl/mdc2.h ../include/openssl/obj_mac.h 533ssltest.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
430ssltest.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
431ssltest.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
432ssltest.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h 534ssltest.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
433ssltest.o: ../include/openssl/rand.h ../include/openssl/rc2.h 535ssltest.o: ../include/openssl/rand.h ../include/openssl/rsa.h
434ssltest.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
435ssltest.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
436ssltest.o: ../include/openssl/safestack.h ../include/openssl/sha.h 536ssltest.o: ../include/openssl/safestack.h ../include/openssl/sha.h
437ssltest.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h 537ssltest.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
438ssltest.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h 538ssltest.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
439ssltest.o: ../include/openssl/stack.h ../include/openssl/symhacks.h 539ssltest.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
440ssltest.o: ../include/openssl/tls1.h ../include/openssl/x509.h 540ssltest.o: ../include/openssl/tls1.h ../include/openssl/ui.h
441ssltest.o: ../include/openssl/x509_vfy.h 541ssltest.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h ssltest.c
diff --git a/src/lib/libssl/test/maketests.com b/src/lib/libssl/test/maketests.com
index 135e0bfeb9..e0be3dd43b 100644
--- a/src/lib/libssl/test/maketests.com
+++ b/src/lib/libssl/test/maketests.com
@@ -143,11 +143,12 @@ $ GOSUB CHECK_OPT_FILE
143$! 143$!
144$! Define The TEST Files. 144$! Define The TEST Files.
145$! 145$!
146$ TEST_FILES = "BNTEST,IDEATEST,MD2TEST,MD4TEST,MD5TEST,HMACTEST,"+ - 146$ TEST_FILES = "BNTEST,ECTEST,IDEATEST,MD2TEST,MD4TEST,MD5TEST,HMACTEST,"+ -
147 "RC2TEST,RC4TEST,RC5TEST,"+ - 147 "RC2TEST,RC4TEST,RC5TEST,"+ -
148 "DESTEST,SHATEST,SHA1TEST,MDC2TEST,RMDTEST,"+ - 148 "DESTEST,SHATEST,SHA1TEST,MDC2TEST,RMDTEST,"+ -
149 "RANDTEST,DHTEST,"+ - 149 "RANDTEST,DHTEST,ENGINETEST,"+ -
150 "BFTEST,CASTTEST,SSLTEST,EXPTEST,DSATEST,RSA_TEST" 150 "BFTEST,CASTTEST,SSLTEST,EXPTEST,DSATEST,RSA_TEST,"+ -
151 "EVP_TEST"
151$ TCPIP_PROGRAMS = ",," 152$ TCPIP_PROGRAMS = ",,"
152$ IF COMPILER .EQS. "VAXC" THEN - 153$ IF COMPILER .EQS. "VAXC" THEN -
153 TCPIP_PROGRAMS = ",SSLTEST," 154 TCPIP_PROGRAMS = ",SSLTEST,"
@@ -514,6 +515,7 @@ $ CHECK_OPTIONS:
514$! 515$!
515$! Check To See If P1 Is Blank. 516$! Check To See If P1 Is Blank.
516$! 517$!
518$ P1 = "NORSAREF"
517$ IF (P1.EQS."NORSAREF") 519$ IF (P1.EQS."NORSAREF")
518$ THEN 520$ THEN
519$! 521$!
@@ -729,31 +731,7 @@ $ ENDIF
729$! 731$!
730$! Set Up Initial CC Definitions, Possibly With User Ones 732$! Set Up Initial CC Definitions, Possibly With User Ones
731$! 733$!
732$ CCDEFS = "VMS=1,TCPIP_TYPE_''P4'" 734$ CCDEFS = "TCPIP_TYPE_''P4'"
733$ IF F$TRNLNM("OPENSSL_NO_ASM") THEN CCDEFS = CCDEFS + ",NO_ASM"
734$ IF F$TRNLNM("OPENSSL_NO_RSA") THEN CCDEFS = CCDEFS + ",NO_RSA"
735$ IF F$TRNLNM("OPENSSL_NO_DSA") THEN CCDEFS = CCDEFS + ",NO_DSA"
736$ IF F$TRNLNM("OPENSSL_NO_DH") THEN CCDEFS = CCDEFS + ",NO_DH"
737$ IF F$TRNLNM("OPENSSL_NO_MD2") THEN CCDEFS = CCDEFS + ",NO_MD2"
738$ IF F$TRNLNM("OPENSSL_NO_MD5") THEN CCDEFS = CCDEFS + ",NO_MD5"
739$ IF F$TRNLNM("OPENSSL_NO_RIPEMD") THEN CCDEFS = CCDEFS + ",NO_RIPEMD"
740$ IF F$TRNLNM("OPENSSL_NO_SHA") THEN CCDEFS = CCDEFS + ",NO_SHA"
741$ IF F$TRNLNM("OPENSSL_NO_SHA0") THEN CCDEFS = CCDEFS + ",NO_SHA0"
742$ IF F$TRNLNM("OPENSSL_NO_SHA1") THEN CCDEFS = CCDEFS + ",NO_SHA1"
743$ IF F$TRNLNM("OPENSSL_NO_DES")
744$ THEN
745$ CCDEFS = CCDEFS + ",NO_DES,NO_MDC2"
746$ ELSE
747$ IF F$TRNLNM("OPENSSL_NO_MDC2") THEN CCDEFS = CCDEFS + ",NO_MDC2"
748$ ENDIF
749$ IF F$TRNLNM("OPENSSL_NO_RC2") THEN CCDEFS = CCDEFS + ",NO_RC2"
750$ IF F$TRNLNM("OPENSSL_NO_RC4") THEN CCDEFS = CCDEFS + ",NO_RC4"
751$ IF F$TRNLNM("OPENSSL_NO_RC5") THEN CCDEFS = CCDEFS + ",NO_RC5"
752$ IF F$TRNLNM("OPENSSL_NO_IDEA") THEN CCDEFS = CCDEFS + ",NO_IDEA"
753$ IF F$TRNLNM("OPENSSL_NO_BF") THEN CCDEFS = CCDEFS + ",NO_BF"
754$ IF F$TRNLNM("OPENSSL_NO_CAST") THEN CCDEFS = CCDEFS + ",NO_CAST"
755$ IF F$TRNLNM("OPENSSL_NO_HMAC") THEN CCDEFS = CCDEFS + ",NO_HMAC"
756$ IF F$TRNLNM("OPENSSL_NO_SSL2") THEN CCDEFS = CCDEFS + ",NO_SSL2"
757$ IF F$TYPE(USER_CCDEFS) .NES. "" THEN CCDEFS = CCDEFS + "," + USER_CCDEFS 735$ IF F$TYPE(USER_CCDEFS) .NES. "" THEN CCDEFS = CCDEFS + "," + USER_CCDEFS
758$ CCEXTRAFLAGS = "" 736$ CCEXTRAFLAGS = ""
759$ IF F$TYPE(USER_CCFLAGS) .NES. "" THEN CCEXTRAFLAGS = USER_CCFLAGS 737$ IF F$TYPE(USER_CCFLAGS) .NES. "" THEN CCEXTRAFLAGS = USER_CCFLAGS
@@ -785,7 +763,8 @@ $ CC = "CC"
785$ IF ARCH.EQS."VAX" .AND. F$TRNLNM("DECC$CC_DEFAULT").NES."/DECC" - 763$ IF ARCH.EQS."VAX" .AND. F$TRNLNM("DECC$CC_DEFAULT").NES."/DECC" -
786 THEN CC = "CC/DECC" 764 THEN CC = "CC/DECC"
787$ CC = CC + "/''CC_OPTIMIZE'/''DEBUGGER'/STANDARD=ANSI89" + - 765$ CC = CC + "/''CC_OPTIMIZE'/''DEBUGGER'/STANDARD=ANSI89" + -
788 "/NOLIST/PREFIX=ALL" + CCEXTRAFLAGS 766 "/NOLIST/PREFIX=ALL" + -
767 "/INCLUDE=(SYS$DISK:[-])" + CCEXTRAFLAGS
789$! 768$!
790$! Define The Linker Options File Name. 769$! Define The Linker Options File Name.
791$! 770$!
@@ -817,7 +796,8 @@ $ WRITE SYS$OUTPUT "There is no VAX C on Alpha!"
817$ EXIT 796$ EXIT
818$ ENDIF 797$ ENDIF
819$ IF F$TRNLNM("DECC$CC_DEFAULT").EQS."/DECC" THEN CC = "CC/VAXC" 798$ IF F$TRNLNM("DECC$CC_DEFAULT").EQS."/DECC" THEN CC = "CC/VAXC"
820$ CC = CC + "/''CC_OPTIMIZE'/''DEBUGGER'/NOLIST" + CCEXTRAFLAGS 799$ CC = CC + "/''CC_OPTIMIZE'/''DEBUGGER'/NOLIST" + -
800 "/INCLUDE=(SYS$DISK:[-])" + CCEXTRAFLAGS
821$ CCDEFS = CCDEFS + ",""VAXC""" 801$ CCDEFS = CCDEFS + ",""VAXC"""
822$! 802$!
823$! Define <sys> As SYS$COMMON:[SYSLIB] 803$! Define <sys> As SYS$COMMON:[SYSLIB]
@@ -847,7 +827,8 @@ $ WRITE SYS$OUTPUT "Using GNU 'C' Compiler."
847$! 827$!
848$! Use GNU C... 828$! Use GNU C...
849$! 829$!
850$ CC = "GCC/NOCASE_HACK/''GCC_OPTIMIZE'/''DEBUGGER'/NOLIST" + CCEXTRAFLAGS 830$ CC = "GCC/NOCASE_HACK/''GCC_OPTIMIZE'/''DEBUGGER'/NOLIST" + -
831 "/INCLUDE=(SYS$DISK:[-])" + CCEXTRAFLAGS
851$! 832$!
852$! Define The Linker Options File Name. 833$! Define The Linker Options File Name.
853$! 834$!
@@ -1050,6 +1031,7 @@ $!
1050$! Save directory information 1031$! Save directory information
1051$! 1032$!
1052$ __HERE = F$PARSE(F$PARSE("A.;",F$ENVIRONMENT("PROCEDURE"))-"A.;","[]A.;") - "A.;" 1033$ __HERE = F$PARSE(F$PARSE("A.;",F$ENVIRONMENT("PROCEDURE"))-"A.;","[]A.;") - "A.;"
1034$ __HERE = F$EDIT(__HERE,"UPCASE")
1053$ __TOP = __HERE - "TEST]" 1035$ __TOP = __HERE - "TEST]"
1054$ __INCLUDE = __TOP + "INCLUDE.OPENSSL]" 1036$ __INCLUDE = __TOP + "INCLUDE.OPENSSL]"
1055$! 1037$!
diff --git a/src/lib/libssl/test/tests.com b/src/lib/libssl/test/tests.com
index df8f46e75d..07a3c7f16d 100644
--- a/src/lib/libssl/test/tests.com
+++ b/src/lib/libssl/test/tests.com
@@ -21,14 +21,15 @@ $ else
21$ tests := - 21$ tests := -
22 test_des,test_idea,test_sha,test_md4,test_md5,test_hmac,- 22 test_des,test_idea,test_sha,test_md4,test_md5,test_hmac,-
23 test_md2,test_mdc2,- 23 test_md2,test_mdc2,-
24 test_rmd,test_rc2,test_rc4,test_rc5,test_bf,test_cast,- 24 test_rmd,test_rc2,test_rc4,test_rc5,test_bf,test_cast,test_rd,-
25 test_rand,test_bn,test_enc,test_x509,test_rsa,test_crl,test_sid,- 25 test_rand,test_bn,test_ec,test_enc,test_x509,test_rsa,test_crl,test_sid,-
26 test_gen,test_req,test_pkcs7,test_verify,test_dh,test_dsa,- 26 test_gen,test_req,test_pkcs7,test_verify,test_dh,test_dsa,-
27 test_ss,test_ca,test_ssl 27 test_ss,test_ca,test_engine,test_ssl,test_evp
28$ endif 28$ endif
29$ tests = f$edit(tests,"COLLAPSE") 29$ tests = f$edit(tests,"COLLAPSE")
30$ 30$
31$ BNTEST := bntest 31$ BNTEST := bntest
32$ ECTEST := ectest
32$ EXPTEST := exptest 33$ EXPTEST := exptest
33$ IDEATEST := ideatest 34$ IDEATEST := ideatest
34$ SHATEST := shatest 35$ SHATEST := shatest
@@ -51,6 +52,8 @@ $ DSATEST := dsatest
51$ METHTEST := methtest 52$ METHTEST := methtest
52$ SSLTEST := ssltest 53$ SSLTEST := ssltest
53$ RSATEST := rsa_test 54$ RSATEST := rsa_test
55$ ENGINETEST := enginetest
56$ EVPTEST := evp_test
54$ 57$
55$ tests_i = 0 58$ tests_i = 0
56$ loop_tests: 59$ loop_tests:
@@ -60,6 +63,9 @@ $ if tests_e .eqs. "," then goto exit
60$ gosub 'tests_e' 63$ gosub 'tests_e'
61$ goto loop_tests 64$ goto loop_tests
62$ 65$
66$ test_evp:
67$ mcr 'texe_dir''evptest' evptests.txt
68$ return
63$ test_des: 69$ test_des:
64$ mcr 'texe_dir''destest' 70$ mcr 'texe_dir''destest'
65$ return 71$ return
@@ -157,7 +163,7 @@ RECORD
157$ create/fdl=bntest-vms.fdl bntest-vms.sh 163$ create/fdl=bntest-vms.fdl bntest-vms.sh
158$ open/append foo bntest-vms.sh 164$ open/append foo bntest-vms.sh
159$ type/output=foo: sys$input: 165$ type/output=foo: sys$input:
160<< __FOO__ bc | perl -e 'while (<STDIN>) {if (/^test (.*)/) {print STDERR "\nverify $1";} elsif (!/^0$/) {die "\nFailed! bc: $_";} print STDERR "."; $i++;} print STDERR "\n$i tests passed\n"' 166<< __FOO__ sh -c "`sh ./bctest`" | perl -e '$i=0; while (<STDIN>) {if (/^test (.*)/) {print STDERR "\nverify $1";} elsif (!/^0$/) {die "\nFailed! bc: $_";} else {print STDERR "."; $i++;}} print STDERR "\n$i tests passed\n"'
161$ define/user sys$output bntest-vms.tmp 167$ define/user sys$output bntest-vms.tmp
162$ mcr 'texe_dir''bntest' 168$ mcr 'texe_dir''bntest'
163$ copy bntest-vms.tmp foo: 169$ copy bntest-vms.tmp foo:
@@ -165,12 +171,17 @@ $ delete bntest-vms.tmp;*
165$ type/output=foo: sys$input: 171$ type/output=foo: sys$input:
166__FOO__ 172__FOO__
167$ close foo 173$ close foo
168$ write sys$output "-- copy the [.test]bntest-vms.sh file to a Unix system and run it" 174$ write sys$output "-- copy the [.test]bntest-vms.sh and [.test]bctest files to a Unix system and"
169$ write sys$output "-- through sh or bash to verify that the bignum operations went well." 175$ write sys$output "-- run bntest-vms.sh through sh or bash to verify that the bignum operations"
176$ write sys$output "-- went well."
170$ write sys$output "" 177$ write sys$output ""
171$ write sys$output "test a^b%c implementations" 178$ write sys$output "test a^b%c implementations"
172$ mcr 'texe_dir''exptest' 179$ mcr 'texe_dir''exptest'
173$ return 180$ return
181$ test_ec:
182$ write sys$output "test elliptic curves"
183$ mcr 'texe_dir''ectest'
184$ return
174$ test_verify: 185$ test_verify:
175$ write sys$output "The following command should have some OK's and some failures" 186$ write sys$output "The following command should have some OK's and some failures"
176$ write sys$output "There are definitly a few expired certificates" 187$ write sys$output "There are definitly a few expired certificates"
@@ -201,6 +212,10 @@ $ test_ss:
201$ write sys$output "Generate and certify a test certificate" 212$ write sys$output "Generate and certify a test certificate"
202$ @testss.com 213$ @testss.com
203$ return 214$ return
215$ test_engine:
216$ write sys$output "Manipulate the ENGINE structures"
217$ mcr 'texe_dir''enginetest'
218$ return
204$ test_ssl: 219$ test_ssl:
205$ write sys$output "test SSL protocol" 220$ write sys$output "test SSL protocol"
206$ gosub maybe_test_ss 221$ gosub maybe_test_ss
@@ -220,6 +235,10 @@ $ write sys$output "Generate and certify a test certificate via the 'ca' pro
220$ @testca.com 235$ @testca.com
221$ endif 236$ endif
222$ return 237$ return
238$ test_rd:
239$ write sys$output "test Rijndael"
240$ !mcr 'texe_dir''rdtest'
241$ return
223$ 242$
224$ 243$
225$ exit: 244$ exit:
diff --git a/src/lib/libssl/test/testss b/src/lib/libssl/test/testss
index da62997a5f..8d3557f356 100644
--- a/src/lib/libssl/test/testss
+++ b/src/lib/libssl/test/testss
@@ -1,6 +1,6 @@
1#!/bin/sh 1#!/bin/sh
2 2
3digest='-mdc2' 3digest='-md5'
4reqcmd="../apps/openssl req" 4reqcmd="../apps/openssl req"
5x509cmd="../apps/openssl x509 $digest" 5x509cmd="../apps/openssl x509 $digest"
6verifycmd="../apps/openssl verify" 6verifycmd="../apps/openssl verify"
@@ -19,7 +19,16 @@ Ucert="certU.ss"
19 19
20echo 20echo
21echo "make a certificate request using 'req'" 21echo "make a certificate request using 'req'"
22$reqcmd -config $CAconf -out $CAreq -keyout $CAkey -new #>err.ss 22
23echo "string to make the random number generator think it has entropy" >> ./.rnd
24
25if ../apps/openssl no-rsa; then
26 req_new='-newkey dsa:../apps/dsa512.pem'
27else
28 req_new='-new'
29fi
30
31$reqcmd -config $CAconf -out $CAreq -keyout $CAkey $req_new #>err.ss
23if [ $? != 0 ]; then 32if [ $? != 0 ]; then
24 echo "error using 'req' to generate a certificate request" 33 echo "error using 'req' to generate a certificate request"
25 exit 1 34 exit 1
@@ -60,7 +69,7 @@ fi
60 69
61echo 70echo
62echo "make another certificate request using 'req'" 71echo "make another certificate request using 'req'"
63$reqcmd -config $Uconf -out $Ureq -keyout $Ukey -new >err.ss 72$reqcmd -config $Uconf -out $Ureq -keyout $Ukey $req_new >err.ss
64if [ $? != 0 ]; then 73if [ $? != 0 ]; then
65 echo "error using 'req' to generate a certificate request" 74 echo "error using 'req' to generate a certificate request"
66 exit 1 75 exit 1
diff --git a/src/lib/libssl/test/testssl b/src/lib/libssl/test/testssl
index a88e290c57..ba5e41c861 100644
--- a/src/lib/libssl/test/testssl
+++ b/src/lib/libssl/test/testssl
@@ -1,81 +1,137 @@
1#!/bin/sh 1#!/bin/sh
2 2
3if [ "$1" = "" ]; then
4 key=../apps/server.pem
5else
6 key="$1"
7fi
8if [ "$2" = "" ]; then
9 cert=../apps/server.pem
10else
11 cert="$2"
12fi
13ssltest="./ssltest -key $key -cert $cert -c_key $key -c_cert $cert"
14
15if ../apps/openssl x509 -in $cert -text -noout | fgrep 'DSA Public Key' >/dev/null; then
16 dsa_cert=YES
17else
18 dsa_cert=NO
19fi
20
21if [ "$3" = "" ]; then
22 CA="-CApath ../certs"
23else
24 CA="-CAfile $3"
25fi
26
27if [ "$4" = "" ]; then
28 extra=""
29else
30 extra="$4"
31fi
32
33#############################################################################
34
3echo test sslv2 35echo test sslv2
4./ssltest -ssl2 || exit 1 36$ssltest -ssl2 $extra || exit 1
5 37
6echo test sslv2 with server authentication 38echo test sslv2 with server authentication
7./ssltest -ssl2 -server_auth -CApath ../certs || exit 1 39$ssltest -ssl2 -server_auth $CA $extra || exit 1
8 40
9echo test sslv2 with client authentication 41if [ $dsa_cert = NO ]; then
10./ssltest -ssl2 -client_auth -CApath ../certs || exit 1 42 echo test sslv2 with client authentication
43 $ssltest -ssl2 -client_auth $CA $extra || exit 1
11 44
12echo test sslv2 with both client and server authentication 45 echo test sslv2 with both client and server authentication
13./ssltest -ssl2 -server_auth -client_auth -CApath ../certs || exit 1 46 $ssltest -ssl2 -server_auth -client_auth $CA $extra || exit 1
47fi
14 48
15echo test sslv3 49echo test sslv3
16./ssltest -ssl3 || exit 1 50$ssltest -ssl3 $extra || exit 1
17 51
18echo test sslv3 with server authentication 52echo test sslv3 with server authentication
19./ssltest -ssl3 -server_auth -CApath ../certs || exit 1 53$ssltest -ssl3 -server_auth $CA $extra || exit 1
20 54
21echo test sslv3 with client authentication 55echo test sslv3 with client authentication
22./ssltest -ssl3 -client_auth -CApath ../certs || exit 1 56$ssltest -ssl3 -client_auth $CA $extra || exit 1
23 57
24echo test sslv3 with both client and server authentication 58echo test sslv3 with both client and server authentication
25./ssltest -ssl3 -server_auth -client_auth -CApath ../certs || exit 1 59$ssltest -ssl3 -server_auth -client_auth $CA $extra || exit 1
26 60
27echo test sslv2/sslv3 61echo test sslv2/sslv3
28./ssltest || exit 1 62$ssltest $extra || exit 1
29 63
30echo test sslv2/sslv3 with server authentication 64echo test sslv2/sslv3 with server authentication
31./ssltest -server_auth -CApath ../certs || exit 1 65$ssltest -server_auth $CA $extra || exit 1
32 66
33echo test sslv2/sslv3 with client authentication 67echo test sslv2/sslv3 with client authentication
34./ssltest -client_auth -CApath ../certs || exit 1 68$ssltest -client_auth $CA $extra || exit 1
35 69
36echo test sslv2/sslv3 with both client and server authentication 70echo test sslv2/sslv3 with both client and server authentication
37./ssltest -server_auth -client_auth -CApath ../certs || exit 1 71$ssltest -server_auth -client_auth $CA $extra || exit 1
38 72
39echo test sslv2 via BIO pair 73echo test sslv2 via BIO pair
40./ssltest -bio_pair -ssl2 || exit 1 74$ssltest -bio_pair -ssl2 $extra || exit 1
41 75
42echo test sslv2 with server authentication via BIO pair 76echo test sslv2 with server authentication via BIO pair
43./ssltest -bio_pair -ssl2 -server_auth -CApath ../certs || exit 1 77$ssltest -bio_pair -ssl2 -server_auth $CA $extra || exit 1
44 78
45echo test sslv2 with client authentication via BIO pair 79if [ $dsa_cert = NO ]; then
46./ssltest -bio_pair -ssl2 -client_auth -CApath ../certs || exit 1 80 echo test sslv2 with client authentication via BIO pair
81 $ssltest -bio_pair -ssl2 -client_auth $CA $extra || exit 1
47 82
48echo test sslv2 with both client and server authentication via BIO pair 83 echo test sslv2 with both client and server authentication via BIO pair
49./ssltest -bio_pair -ssl2 -server_auth -client_auth -CApath ../certs || exit 1 84 $ssltest -bio_pair -ssl2 -server_auth -client_auth $CA $extra || exit 1
85fi
50 86
51echo test sslv3 via BIO pair 87echo test sslv3 via BIO pair
52./ssltest -bio_pair -ssl3 || exit 1 88$ssltest -bio_pair -ssl3 $extra || exit 1
53 89
54echo test sslv3 with server authentication via BIO pair 90echo test sslv3 with server authentication via BIO pair
55./ssltest -bio_pair -ssl3 -server_auth -CApath ../certs || exit 1 91$ssltest -bio_pair -ssl3 -server_auth $CA $extra || exit 1
56 92
57echo test sslv3 with client authentication via BIO pair 93echo test sslv3 with client authentication via BIO pair
58./ssltest -bio_pair -ssl3 -client_auth -CApath ../certs || exit 1 94$ssltest -bio_pair -ssl3 -client_auth $CA $extra || exit 1
59 95
60echo test sslv3 with both client and server authentication via BIO pair 96echo test sslv3 with both client and server authentication via BIO pair
61./ssltest -bio_pair -ssl3 -server_auth -client_auth -CApath ../certs || exit 1 97$ssltest -bio_pair -ssl3 -server_auth -client_auth $CA $extra || exit 1
62 98
63echo test sslv2/sslv3 via BIO pair 99echo test sslv2/sslv3 via BIO pair
64./ssltest || exit 1 100$ssltest $extra || exit 1
65 101
66echo test sslv2/sslv3 w/o DHE via BIO pair 102if [ $dsa_cert = NO ]; then
67./ssltest -bio_pair -no_dhe || exit 1 103 echo test sslv2/sslv3 w/o DHE via BIO pair
104 $ssltest -bio_pair -no_dhe $extra || exit 1
105fi
68 106
69echo test sslv2/sslv3 with 1024bit DHE 107echo test sslv2/sslv3 with 1024bit DHE via BIO pair
70./ssltest -bio_pair -dhe1024 -v || exit 1 108$ssltest -bio_pair -dhe1024dsa -v $extra || exit 1
71 109
72echo test sslv2/sslv3 with server authentication 110echo test sslv2/sslv3 with server authentication
73./ssltest -bio_pair -server_auth -CApath ../certs || exit 1 111$ssltest -bio_pair -server_auth $CA $extra || exit 1
74 112
75echo test sslv2/sslv3 with client authentication via BIO pair 113echo test sslv2/sslv3 with client authentication via BIO pair
76./ssltest -bio_pair -client_auth -CApath ../certs || exit 1 114$ssltest -bio_pair -client_auth $CA $extra || exit 1
77 115
78echo test sslv2/sslv3 with both client and server authentication via BIO pair 116echo test sslv2/sslv3 with both client and server authentication via BIO pair
79./ssltest -bio_pair -server_auth -client_auth -CApath ../certs || exit 1 117$ssltest -bio_pair -server_auth -client_auth $CA $extra || exit 1
118
119echo test sslv2/sslv3 with both client and server authentication via BIO pair and app verify
120$ssltest -bio_pair -server_auth -client_auth -app_verify $CA $extra || exit 1
121
122#############################################################################
123
124echo test tls1 with 1024bit anonymous DH, multiple handshakes
125$ssltest -v -bio_pair -tls1 -cipher ADH -dhe1024dsa -num 10 -f -time $extra || exit 1
126
127if ../apps/openssl no-rsa; then
128 echo skipping RSA tests
129else
130 echo test tls1 with 1024bit RSA, no DHE, multiple handshakes
131 ./ssltest -v -bio_pair -tls1 -cert ../apps/server2.pem -no_dhe -num 10 -f -time $extra || exit 1
132
133 echo test tls1 with 1024bit RSA, 1024bit DHE, multiple handshakes
134 ./ssltest -v -bio_pair -tls1 -cert ../apps/server2.pem -dhe1024dsa -num 10 -f -time $extra || exit 1
135fi
80 136
81exit 0 137exit 0
diff --git a/src/lib/libssl/test/tmp.bctest b/src/lib/libssl/test/tmp.bctest
new file mode 100644
index 0000000000..aa47d0d46d
--- /dev/null
+++ b/src/lib/libssl/test/tmp.bctest
@@ -0,0 +1,2 @@
10
20
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-17 23:51:39 +0000