summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarkus <>2002-09-03 21:43:59 +0000
committermarkus <>2002-09-03 21:43:59 +0000
commit807f310b065312b137e9eb85536bc668e67ee7b9 (patch)
treebd2ada0f35faf6ca826fafd4b2d451451aaf3cb4
parent374d65fa455af7b635928d7a27c61196b63e577c (diff)
downloadopenbsd-807f310b065312b137e9eb85536bc668e67ee7b9.tar.gz
openbsd-807f310b065312b137e9eb85536bc668e67ee7b9.tar.bz2
openbsd-807f310b065312b137e9eb85536bc668e67ee7b9.zip
sync these files with openssl-0.9.7-beta1, too
Diffstat
-rw-r--r--src/lib/libssl/src/INSTALL7
-rw-r--r--src/lib/libssl/src/INSTALL.W328
-rw-r--r--src/lib/libssl/src/config18
-rw-r--r--src/lib/libssl/src/makevms.com23
-rw-r--r--src/lib/libssl/src/ssl/ssl-lib.com2
-rw-r--r--src/lib/libssl/src/test/maketests.com30
-rw-r--r--src/lib/libssl/src/test/testgen.com24
-rw-r--r--src/lib/libssl/src/test/testss.com19
-rw-r--r--src/lib/libssl/src/test/testssl.com155
-rw-r--r--src/lib/libssl/src/test/trsa.com11
-rw-r--r--src/lib/libssl/test/maketests.com30
-rw-r--r--src/lib/libssl/test/testgen.com24
-rw-r--r--src/lib/libssl/test/testss.com19
-rw-r--r--src/lib/libssl/test/testssl.com155
-rw-r--r--src/lib/libssl/test/trsa.com11
15 files changed, 359 insertions, 177 deletions
diff --git a/src/lib/libssl/src/INSTALL b/src/lib/libssl/src/INSTALL
index 06aa96bcfa..7eaa8147c3 100644
--- a/src/lib/libssl/src/INSTALL
+++ b/src/lib/libssl/src/INSTALL
@@ -2,8 +2,8 @@
2 INSTALLATION ON THE UNIX PLATFORM 2 INSTALLATION ON THE UNIX PLATFORM
3 --------------------------------- 3 ---------------------------------
4 4
5 [See INSTALL.W32 for instructions for compiling OpenSSL on Windows systems, 5 [Installation on Windows, OpenVMS and MacOS (before MacOS X) is described
6 and INSTALL.VMS for installing on OpenVMS systems.] 6 in INSTALL.W32, INSTALL.VMS and INSTALL.MacOS.]
7 7
8 To install OpenSSL, you will need: 8 To install OpenSSL, you will need:
9 9
@@ -36,7 +36,8 @@
36 Configuration Options 36 Configuration Options
37 --------------------- 37 ---------------------
38 38
39 There are several options to ./config to customize the build: 39 There are several options to ./config (or ./Configure) to customize
40 the build:
40 41
41 --prefix=DIR Install in DIR/bin, DIR/lib, DIR/include/openssl. 42 --prefix=DIR Install in DIR/bin, DIR/lib, DIR/include/openssl.
42 Configuration files used by OpenSSL will be in DIR/ssl 43 Configuration files used by OpenSSL will be in DIR/ssl
diff --git a/src/lib/libssl/src/INSTALL.W32 b/src/lib/libssl/src/INSTALL.W32
index 852a82831f..d85d81b0fd 100644
--- a/src/lib/libssl/src/INSTALL.W32
+++ b/src/lib/libssl/src/INSTALL.W32
@@ -119,10 +119,12 @@
119 119
120 * Compile OpenSSL: 120 * Compile OpenSSL:
121 121
122 > perl Configure Mingw32 122 > ms\mingw32
123 > ms\mw.bat
124 123
125 This will create the library and binaries in out. 124 This will create the library and binaries in out. In case any problems
125 occur, try
126 > ms\mingw32 no-asm
127 instead.
126 128
127 libcrypto.a and libssl.a are the static libraries. To use the DLLs, 129 libcrypto.a and libssl.a are the static libraries. To use the DLLs,
128 link with libeay32.a and libssl32.a instead. 130 link with libeay32.a and libssl32.a instead.
diff --git a/src/lib/libssl/src/config b/src/lib/libssl/src/config
index ece3248393..3d443da6fb 100644
--- a/src/lib/libssl/src/config
+++ b/src/lib/libssl/src/config
@@ -390,13 +390,11 @@ exit 0
390 390
391# figure out if gcc is available and if so we use it otherwise 391# figure out if gcc is available and if so we use it otherwise
392# we fallback to whatever cc does on the system 392# we fallback to whatever cc does on the system
393GCCVER=`(gcc --version) 2>/dev/null | head -1` 393GCCVER=`(gcc --version) 2>/dev/null`
394if [ "$GCCVER" != "" ]; then 394if [ "$GCCVER" != "" ]; then
395 CC=gcc 395 CC=gcc
396 # then strip off whatever prefix Cygnus as well as GCC 3.1 prepends 396 # then strip off whatever prefix Cygnus prepends the number with...
397 # the number with... Hopefully, this will work for any future prefixes 397 GCCVER=`echo $GCCVER | sed 's/^[a-z]*\-//'`
398 # as well.
399 GCCVER=`echo $GCCVER | sed 's/^[a-zA-Z ()]*\-//'`
400 # peak single digit before and after first dot, e.g. 2.95.1 gives 29 398 # peak single digit before and after first dot, e.g. 2.95.1 gives 29
401 GCCVER=`echo $GCCVER | sed 's/\([0-9]\)\.\([0-9]\).*/\1\2/'` 399 GCCVER=`echo $GCCVER | sed 's/\([0-9]\)\.\([0-9]\).*/\1\2/'`
402else 400else
@@ -525,6 +523,7 @@ EOF
525 OUT="linux-ppc" ;; 523 OUT="linux-ppc" ;;
526 ppc-*-linux2) OUT="linux-ppc" ;; 524 ppc-*-linux2) OUT="linux-ppc" ;;
527 m68k-*-linux*) OUT="linux-m68k" ;; 525 m68k-*-linux*) OUT="linux-m68k" ;;
526 ia64-*-linux?) OUT="linux-ia64" ;;
528 ppc-apple-rhapsody) OUT="rhapsody-ppc-cc" ;; 527 ppc-apple-rhapsody) OUT="rhapsody-ppc-cc" ;;
529 ppc-apple-darwin*) OUT="darwin-ppc-cc" ;; 528 ppc-apple-darwin*) OUT="darwin-ppc-cc" ;;
530 i386-apple-darwin*) OUT="darwin-i386-cc" ;; 529 i386-apple-darwin*) OUT="darwin-i386-cc" ;;
@@ -625,10 +624,17 @@ EOF
625 *86*-*-netbsd) OUT="NetBSD-x86" ;; 624 *86*-*-netbsd) OUT="NetBSD-x86" ;;
626 sun3*-*-netbsd) OUT="NetBSD-m68" ;; 625 sun3*-*-netbsd) OUT="NetBSD-m68" ;;
627 *-*-netbsd) OUT="NetBSD-sparc" ;; 626 *-*-netbsd) OUT="NetBSD-sparc" ;;
628 *86*-*-openbsd) OUT="OpenBSD-x86" ;;
629 alpha*-*-openbsd) OUT="OpenBSD-alpha" ;; 627 alpha*-*-openbsd) OUT="OpenBSD-alpha" ;;
628 *86*-*-openbsd) OUT="OpenBSD-i386" ;;
629 m68k*-*-openbsd) OUT="OpenBSD-m68k" ;;
630 m88k*-*-openbsd) OUT="OpenBSD-m88k" ;;
631 mips*-*-openbsd) OUT="OpenBSD-mips" ;;
630 pmax*-*-openbsd) OUT="OpenBSD-mips" ;; 632 pmax*-*-openbsd) OUT="OpenBSD-mips" ;;
633 powerpc*-*-openbsd) OUT="OpenBSD-powerpc" ;;
634 sparc64*-*-openbsd) OUT="OpenBSD-sparc64" ;;
635 sparc*-*-openbsd) OUT="OpenBSD-sparc" ;;
631 vax*-*-openbsd) OUT="OpenBSD-vax" ;; 636 vax*-*-openbsd) OUT="OpenBSD-vax" ;;
637 hppa*-*-openbsd) OUT="OpenBSD-hppa" ;;
632 *-*-openbsd) OUT="OpenBSD" ;; 638 *-*-openbsd) OUT="OpenBSD" ;;
633 *86*-*-bsdi4) OUT="bsdi-elf-gcc" ;; 639 *86*-*-bsdi4) OUT="bsdi-elf-gcc" ;;
634 *-*-osf) OUT="alphaold-cc" ;; 640 *-*-osf) OUT="alphaold-cc" ;;
diff --git a/src/lib/libssl/src/makevms.com b/src/lib/libssl/src/makevms.com
index ba9e911fac..e5c1edbe0e 100644
--- a/src/lib/libssl/src/makevms.com
+++ b/src/lib/libssl/src/makevms.com
@@ -23,6 +23,8 @@ $! SOFTLINKS Just fix the Unix soft links.
23$! BUILDALL Same as ALL, except CONFIG, BUILDINF and SOFTILNKS aren't done. 23$! BUILDALL Same as ALL, except CONFIG, BUILDINF and SOFTILNKS aren't done.
24$! RSAREF Just build the "[.xxx.EXE.RSAREF]LIBRSAGLUE.OLB" library. 24$! RSAREF Just build the "[.xxx.EXE.RSAREF]LIBRSAGLUE.OLB" library.
25$! CRYPTO Just build the "[.xxx.EXE.CRYPTO]LIBCRYPTO.OLB" library. 25$! CRYPTO Just build the "[.xxx.EXE.CRYPTO]LIBCRYPTO.OLB" library.
26$! CRYPTO/x Just build the x part of the
27$! "[.xxx.EXE.CRYPTO]LIBCRYPTO.OLB" library.
26$! SSL Just build the "[.xxx.EXE.SSL]LIBSSL.OLB" library. 28$! SSL Just build the "[.xxx.EXE.SSL]LIBSSL.OLB" library.
27$! SSL_TASK Just build the "[.xxx.EXE.SSL]SSL_TASK.EXE" program. 29$! SSL_TASK Just build the "[.xxx.EXE.SSL]SSL_TASK.EXE" program.
28$! TEST Just build the "[.xxx.EXE.TEST]" test programs for OpenSSL. 30$! TEST Just build the "[.xxx.EXE.TEST]" test programs for OpenSSL.
@@ -529,7 +531,7 @@ $ SET DEFAULT SYS$DISK:[.CRYPTO]
529$! 531$!
530$! Build The [.xxx.EXE.CRYPTO]LIBCRYPTO.OLB Library. 532$! Build The [.xxx.EXE.CRYPTO]LIBCRYPTO.OLB Library.
531$! 533$!
532$ @CRYPTO-LIB LIBRARY 'RSAREF' 'DEBUGGER' "''COMPILER'" "''TCPIP_TYPE'" 'ISSEVEN' 534$ @CRYPTO-LIB LIBRARY 'RSAREF' 'DEBUGGER' "''COMPILER'" "''TCPIP_TYPE'" "''ISSEVEN'" "''BUILDPART'"
533$! 535$!
534$! Build The [.xxx.EXE.CRYPTO]*.EXE Test Applications. 536$! Build The [.xxx.EXE.CRYPTO]*.EXE Test Applications.
535$! 537$!
@@ -675,6 +677,16 @@ $! Check The User's Options.
675$! 677$!
676$ CHECK_OPTIONS: 678$ CHECK_OPTIONS:
677$! 679$!
680$! Check if there's a "part", and separate it out
681$!
682$ BUILDPART = F$ELEMENT(1,"/",P1)
683$ IF BUILDPART .EQS. "/"
684$ THEN
685$ BUILDPART = ""
686$ ELSE
687$ P1 = F$EXTRACT(0,F$LENGTH(P1) - F$LENGTH(BUILDPART) - 1, P1)
688$ ENDIF
689$!
678$! Check To See If P1 Is Blank. 690$! Check To See If P1 Is Blank.
679$! 691$!
680$ IF (P1.EQS."ALL") 692$ IF (P1.EQS."ALL")
@@ -690,9 +702,10 @@ $ ELSE
690$! 702$!
691$! Else, Check To See If P1 Has A Valid Arguement. 703$! Else, Check To See If P1 Has A Valid Arguement.
692$! 704$!
693$ IF (P1.EQS."BUILDINF").OR.(P1.EQS."SOFTLINKS").OR.(P1.EQS."CRYPTO") - 705$ IF (P1.EQS."CONFIG").OR.(P1.EQS."BUILDINF").OR.(P1.EQS."SOFTLINKS") -
694 .OR.(P1.EQS."SSL").OR.(P1.EQS."RSAREF").OR.(P1.EQS."SSL_TASK") - 706 .OR.(P1.EQS."BUILDALL") -
695 .OR.(P1.EQS."TEST").OR.(P1.EQS."APPS") 707 .OR.(P1.EQS."CRYPTO").OR.(P1.EQS."SSL").OR.(P1.EQS."RSAREF") -
708 .OR.(P1.EQS."SSL_TASK").OR.(P1.EQS."TEST").OR.(P1.EQS."APPS")
696$ THEN 709$ THEN
697$! 710$!
698$! A Valid Arguement. 711$! A Valid Arguement.
@@ -714,6 +727,8 @@ $ WRITE SYS$OUTPUT " BUILDINF : Just build the [.CRYPTO]BUILDINF.H file.
714$ WRITE SYS$OUTPUT " SOFTLINKS: Just Fix The Unix soft links." 727$ WRITE SYS$OUTPUT " SOFTLINKS: Just Fix The Unix soft links."
715$ WRITE SYS$OUTPUT " BUILDALL : Same as ALL, except CONFIG, BUILDINF and SOFTILNKS aren't done." 728$ WRITE SYS$OUTPUT " BUILDALL : Same as ALL, except CONFIG, BUILDINF and SOFTILNKS aren't done."
716$ WRITE SYS$OUTPUT " CRYPTO : To Build Just The [.xxx.EXE.CRYPTO]LIBCRYPTO.OLB Library." 729$ WRITE SYS$OUTPUT " CRYPTO : To Build Just The [.xxx.EXE.CRYPTO]LIBCRYPTO.OLB Library."
730$ WRITE SYS$OUTPUT " CRYPTO/x : To Build Just The x Part Of The"
731$ WRITE SYS$OUTPUT " [.xxx.EXE.CRYPTO]LIBCRYPTO.OLB Library."
717$ WRITE SYS$OUTPUT " SSL : To Build Just The [.xxx.EXE.SSL]LIBSSL.OLB Library." 732$ WRITE SYS$OUTPUT " SSL : To Build Just The [.xxx.EXE.SSL]LIBSSL.OLB Library."
718$ WRITE SYS$OUTPUT " SSL_TASK : To Build Just The [.xxx.EXE.SSL]SSL_TASK.EXE Program." 733$ WRITE SYS$OUTPUT " SSL_TASK : To Build Just The [.xxx.EXE.SSL]SSL_TASK.EXE Program."
719$ WRITE SYS$OUTPUT " TEST : To Build Just The OpenSSL Test Programs." 734$ WRITE SYS$OUTPUT " TEST : To Build Just The OpenSSL Test Programs."
diff --git a/src/lib/libssl/src/ssl/ssl-lib.com b/src/lib/libssl/src/ssl/ssl-lib.com
index 1f1921e162..e706ab8e99 100644
--- a/src/lib/libssl/src/ssl/ssl-lib.com
+++ b/src/lib/libssl/src/ssl/ssl-lib.com
@@ -314,7 +314,7 @@ $ WRITE SYS$OUTPUT "Creating SSL_TASK OSU HTTP SSL Engine."
314$! 314$!
315$! Compile The File. 315$! Compile The File.
316$! 316$!
317$ ON ERROR THEN GOTO SSL_TASK_END 317$ ON ERROR GOTO SSL_TASK_END
318$ CC5/OBJECT='OBJ_DIR'SSL_TASK.OBJ SYS$DISK:[]SSL_TASK.C 318$ CC5/OBJECT='OBJ_DIR'SSL_TASK.OBJ SYS$DISK:[]SSL_TASK.C
319$! 319$!
320$! Link The Program, Check To See If We Need To Link With RSAREF Or Not. 320$! Link The Program, Check To See If We Need To Link With RSAREF Or Not.
diff --git a/src/lib/libssl/src/test/maketests.com b/src/lib/libssl/src/test/maketests.com
index b3bf8bb837..f7ff8fe407 100644
--- a/src/lib/libssl/src/test/maketests.com
+++ b/src/lib/libssl/src/test/maketests.com
@@ -910,8 +910,7 @@ $ ENDIF
910$! 910$!
911$! Time to check the contents, and to make sure we get the correct library. 911$! Time to check the contents, and to make sure we get the correct library.
912$! 912$!
913$ IF P4.EQS."SOCKETSHR" .OR. P4.EQS."MULTINET" .OR. P4.EQS."UCX" - 913$ IF P4.EQS."SOCKETSHR" .OR. P4.EQS."MULTINET" .OR. P4.EQS."UCX"
914 .OR. P4.EQS."TCPIP" .OR. P4.EQS."NONE"
915$ THEN 914$ THEN
916$! 915$!
917$! Check to see if SOCKETSHR was chosen 916$! Check to see if SOCKETSHR was chosen
@@ -960,32 +959,6 @@ $! Done with UCX
960$! 959$!
961$ ENDIF 960$ ENDIF
962$! 961$!
963$! Check to see if TCPIP was chosen
964$!
965$ IF P4.EQS."TCPIP"
966$ THEN
967$!
968$! Set the library to use TCPIP (post UCX).
969$!
970$ TCPIP_LIB = "SYS$DISK:[-.VMS]TCPIP_SHR_DECC.OPT/OPT"
971$!
972$! Done with TCPIP
973$!
974$ ENDIF
975$!
976$! Check to see if NONE was chosen
977$!
978$ IF P4.EQS."NONE"
979$ THEN
980$!
981$! Do not use a TCPIP library.
982$!
983$ TCPIP_LIB = ""
984$!
985$! Done with NONE
986$!
987$ ENDIF
988$!
989$! Print info 962$! Print info
990$! 963$!
991$ WRITE SYS$OUTPUT "TCP/IP library spec: ", TCPIP_LIB 964$ WRITE SYS$OUTPUT "TCP/IP library spec: ", TCPIP_LIB
@@ -1001,7 +974,6 @@ $ WRITE SYS$OUTPUT "The Option ",P4," Is Invalid. The Valid Options Are:"
1001$ WRITE SYS$OUTPUT "" 974$ WRITE SYS$OUTPUT ""
1002$ WRITE SYS$OUTPUT " SOCKETSHR : To link with SOCKETSHR TCP/IP library." 975$ WRITE SYS$OUTPUT " SOCKETSHR : To link with SOCKETSHR TCP/IP library."
1003$ WRITE SYS$OUTPUT " UCX : To link with UCX TCP/IP library." 976$ WRITE SYS$OUTPUT " UCX : To link with UCX TCP/IP library."
1004$ WRITE SYS$OUTPUT " TCPIP : To link with TCPIP (post UCX) TCP/IP library."
1005$ WRITE SYS$OUTPUT "" 977$ WRITE SYS$OUTPUT ""
1006$! 978$!
1007$! Time To EXIT. 979$! Time To EXIT.
diff --git a/src/lib/libssl/src/test/testgen.com b/src/lib/libssl/src/test/testgen.com
index 0e9029371a..5d28ebec72 100644
--- a/src/lib/libssl/src/test/testgen.com
+++ b/src/lib/libssl/src/test/testgen.com
@@ -16,23 +16,35 @@ $ set on
16$ 16$
17$ write sys$output "generating certificate request" 17$ write sys$output "generating certificate request"
18$ 18$
19$ write sys$output "There should be a 2 sequences of .'s and some +'s."
20$ write sys$output "There should not be more that at most 80 per line"
21$ write sys$output "This could take some time."
22$
23$ append/new nl: .rnd 19$ append/new nl: .rnd
24$ open/append random_file .rnd 20$ open/append random_file .rnd
25$ write random_file "string to make the random number generator think it has entropy" 21$ write random_file "string to make the random number generator think it has entropy"
26$ close random_file 22$ close random_file
27$ 23$
28$ mcr 'exe_dir'openssl req -config test.cnf -new -out testreq.pem 24$ set noon
25$ define/user sys$output nla0:
26$ mcr 'exe_dir'openssl no-rsa
27$ save_severity=$SEVERITY
28$ set on
29$ if save_severity
30$ then
31$ req_new="-newkey dsa:[-.apps]dsa512.pem"
32$ else
33$ req_new="-new"
34$ write sys$output "There should be a 2 sequences of .'s and some +'s."
35$ write sys$output "There should not be more that at most 80 per line"
36$ endif
37$
38$ write sys$output "This could take some time."
39$
40$ mcr 'exe_dir'openssl req -config test.cnf 'req_new' -out testreq.pem
29$ if $severity .ne. 1 41$ if $severity .ne. 1
30$ then 42$ then
31$ write sys$output "problems creating request" 43$ write sys$output "problems creating request"
32$ exit 3 44$ exit 3
33$ endif 45$ endif
34$ 46$
35$ mcr 'exe_dir'openssl req -verify -in testreq.pem -noout 47$ mcr 'exe_dir'openssl req -config test.cnf -verify -in testreq.pem -noout
36$ if $severity .ne. 1 48$ if $severity .ne. 1
37$ then 49$ then
38$ write sys$output "signature on req is wrong" 50$ write sys$output "signature on req is wrong"
diff --git a/src/lib/libssl/src/test/testss.com b/src/lib/libssl/src/test/testss.com
index ce2c4b43f6..685ae5043d 100644
--- a/src/lib/libssl/src/test/testss.com
+++ b/src/lib/libssl/src/test/testss.com
@@ -4,7 +4,7 @@ $ __arch := VAX
4$ if f$getsyi("cpu") .ge. 128 then __arch := AXP 4$ if f$getsyi("cpu") .ge. 128 then __arch := AXP
5$ exe_dir := sys$disk:[-.'__arch'.exe.apps] 5$ exe_dir := sys$disk:[-.'__arch'.exe.apps]
6$ 6$
7$ digest="-mdc2" 7$ digest="-md5"
8$ reqcmd := mcr 'exe_dir'openssl req 8$ reqcmd := mcr 'exe_dir'openssl req
9$ x509cmd := mcr 'exe_dir'openssl x509 'digest' 9$ x509cmd := mcr 'exe_dir'openssl x509 'digest'
10$ verifycmd := mcr 'exe_dir'openssl verify 10$ verifycmd := mcr 'exe_dir'openssl verify
@@ -23,7 +23,20 @@ $ Ucert="""certU.ss"""
23$ 23$
24$ write sys$output "" 24$ write sys$output ""
25$ write sys$output "make a certificate request using 'req'" 25$ write sys$output "make a certificate request using 'req'"
26$ 'reqcmd' -config 'CAconf' -out 'CAreq' -keyout 'CAkey' -new ! -out err.ss 26$
27$ set noon
28$ define/user sys$output nla0:
29$ mcr 'exe_dir'openssl no-rsa
30$ save_severity=$SEVERITY
31$ set on
32$ if save_severity
33$ then
34$ req_new="-newkey dsa:[-.apps]dsa512.pem"
35$ else
36$ req_new="-new"
37$ endif
38$
39$ 'reqcmd' -config 'CAconf' -out 'CAreq' -keyout 'CAkey' 'req_new' ! -out err.ss
27$ if $severity .ne. 1 40$ if $severity .ne. 1
28$ then 41$ then
29$ write sys$output "error using 'req' to generate a certificate request" 42$ write sys$output "error using 'req' to generate a certificate request"
@@ -73,7 +86,7 @@ $
73$ write sys$output "" 86$ write sys$output ""
74$ write sys$output "make another certificate request using 'req'" 87$ write sys$output "make another certificate request using 'req'"
75$ define /user sys$output err.ss 88$ define /user sys$output err.ss
76$ 'reqcmd' -config 'Uconf' -out 'Ureq' -keyout 'Ukey' -new 89$ 'reqcmd' -config 'Uconf' -out 'Ureq' -keyout 'Ukey' 'req_new'
77$ if $severity .ne. 1 90$ if $severity .ne. 1
78$ then 91$ then
79$ write sys$output "error using 'req' to generate a certificate request" 92$ write sys$output "error using 'req' to generate a certificate request"
diff --git a/src/lib/libssl/src/test/testssl.com b/src/lib/libssl/src/test/testssl.com
index 0b4b0a0ad3..785f262f5a 100644
--- a/src/lib/libssl/src/test/testssl.com
+++ b/src/lib/libssl/src/test/testssl.com
@@ -2,118 +2,189 @@ $! TESTSSL.COM
2$ 2$
3$ __arch := VAX 3$ __arch := VAX
4$ if f$getsyi("cpu") .ge. 128 then __arch := AXP 4$ if f$getsyi("cpu") .ge. 128 then __arch := AXP
5$ exe_dir := sys$disk:[-.'__arch'.exe.test] 5$ texe_dir := sys$disk:[-.'__arch'.exe.test]
6$ 6$ exe_dir := sys$disk:[-.'__arch'.exe.apps]
7$ copy/concatenate [-.certs]*.pem certs.tmp 7$
8$ if p1 .eqs. ""
9$ then
10$ key="[-.apps]server.pem"
11$ else
12$ key=p1
13$ endif
14$ if p2 .eqs. ""
15$ then
16$ cert="[-.apps]server.pem"
17$ else
18$ cert=p2
19$ endif
20$ ssltest := mcr 'texe_dir'ssltest -key 'key' -cert 'cert' -c_key 'key' -c_cert 'cert'
21$
22$ define/user sys$output testssl-x509-output.
23$ define/user sys$error nla0:
24$ mcr 'exe_dir'openssl x509 -in 'cert' -text -noout
25$ set noon
26$ define/user sys$error nla0:
27$ search/output=nla0: testssl-x509-output. "DSA Public Key"/exact
28$ if $severity .eq. 1
29$ then
30$ dsa_cert := YES
31$ else
32$ dsa_cert := NO
33$ endif
34$ set on
35$ delete testssl-x509-output.;*
36$
37$ if p3 .eqs. ""
38$ then
39$ copy/concatenate [-.certs]*.pem certs.tmp
40$ CA = """-CAfile"" certs.tmp"
41$ else
42$ CA = """-CAfile"" "+p3
43$ endif
44$
45$!###########################################################################
8$ 46$
9$ write sys$output "test sslv2" 47$ write sys$output "test sslv2"
10$ mcr 'exe_dir'ssltest -ssl2 48$ 'ssltest' -ssl2
11$ if $severity .ne. 1 then goto exit3 49$ if $severity .ne. 1 then goto exit3
12$ 50$
13$ write sys$output "test sslv2 with server authentication" 51$ write sys$output "test sslv2 with server authentication"
14$ mcr 'exe_dir'ssltest -ssl2 -server_auth "-CAfile" certs.tmp 52$ 'ssltest' -ssl2 -server_auth 'CA'
15$ if $severity .ne. 1 then goto exit3 53$ if $severity .ne. 1 then goto exit3
16$ 54$
17$ write sys$output "test sslv2 with client authentication" 55$ if .not. dsa_cert
18$ mcr 'exe_dir'ssltest -ssl2 -client_auth "-CAfile" certs.tmp 56$ then
19$ if $severity .ne. 1 then goto exit3 57$ write sys$output "test sslv2 with client authentication"
58$ 'ssltest' -ssl2 -client_auth 'CA'
59$ if $severity .ne. 1 then goto exit3
20$ 60$
21$ write sys$output "test sslv2 with both client and server authentication" 61$ write sys$output "test sslv2 with both client and server authentication"
22$ mcr 'exe_dir'ssltest -ssl2 -server_auth -client_auth "-CAfile" certs.tmp 62$ 'ssltest' -ssl2 -server_auth -client_auth 'CA'
23$ if $severity .ne. 1 then goto exit3 63$ if $severity .ne. 1 then goto exit3
64$ endif
24$ 65$
25$ write sys$output "test sslv3" 66$ write sys$output "test sslv3"
26$ mcr 'exe_dir'ssltest -ssl3 67$ 'ssltest' -ssl3
27$ if $severity .ne. 1 then goto exit3 68$ if $severity .ne. 1 then goto exit3
28$ 69$
29$ write sys$output "test sslv3 with server authentication" 70$ write sys$output "test sslv3 with server authentication"
30$ mcr 'exe_dir'ssltest -ssl3 -server_auth "-CAfile" certs.tmp 71$ 'ssltest' -ssl3 -server_auth 'CA'
31$ if $severity .ne. 1 then goto exit3 72$ if $severity .ne. 1 then goto exit3
32$ 73$
33$ write sys$output "test sslv3 with client authentication" 74$ write sys$output "test sslv3 with client authentication"
34$ mcr 'exe_dir'ssltest -ssl3 -client_auth "-CAfile" certs.tmp 75$ 'ssltest' -ssl3 -client_auth 'CA'
35$ if $severity .ne. 1 then goto exit3 76$ if $severity .ne. 1 then goto exit3
36$ 77$
37$ write sys$output "test sslv3 with both client and server authentication" 78$ write sys$output "test sslv3 with both client and server authentication"
38$ mcr 'exe_dir'ssltest -ssl3 -server_auth -client_auth "-CAfile" certs.tmp 79$ 'ssltest' -ssl3 -server_auth -client_auth 'CA'
39$ if $severity .ne. 1 then goto exit3 80$ if $severity .ne. 1 then goto exit3
40$ 81$
41$ write sys$output "test sslv2/sslv3" 82$ write sys$output "test sslv2/sslv3"
42$ mcr 'exe_dir'ssltest 83$ 'ssltest'
43$ if $severity .ne. 1 then goto exit3 84$ if $severity .ne. 1 then goto exit3
44$ 85$
45$ write sys$output "test sslv2/sslv3 with server authentication" 86$ write sys$output "test sslv2/sslv3 with server authentication"
46$ mcr 'exe_dir'ssltest -server_auth "-CAfile" certs.tmp 87$ 'ssltest' -server_auth 'CA'
47$ if $severity .ne. 1 then goto exit3 88$ if $severity .ne. 1 then goto exit3
48$ 89$
49$ write sys$output "test sslv2/sslv3 with client authentication" 90$ write sys$output "test sslv2/sslv3 with client authentication"
50$ mcr 'exe_dir'ssltest -client_auth "-CAfile" certs.tmp 91$ 'ssltest' -client_auth 'CA'
51$ if $severity .ne. 1 then goto exit3 92$ if $severity .ne. 1 then goto exit3
52$ 93$
53$ write sys$output "test sslv2/sslv3 with both client and server authentication" 94$ write sys$output "test sslv2/sslv3 with both client and server authentication"
54$ mcr 'exe_dir'ssltest -server_auth -client_auth "-CAfile" certs.tmp 95$ 'ssltest' -server_auth -client_auth 'CA'
55$ if $severity .ne. 1 then goto exit3 96$ if $severity .ne. 1 then goto exit3
56$ 97$
57$ write sys$output "test sslv2 via BIO pair" 98$ write sys$output "test sslv2 via BIO pair"
58$ mcr 'exe_dir'ssltest -bio_pair -ssl2 99$ 'ssltest' -bio_pair -ssl2
59$ if $severity .ne. 1 then goto exit3
60$
61$ write sys$output "test sslv2/sslv3 with 1024 bit DHE via BIO pair"
62$ mcr 'exe_dir'ssltest -bio_pair -dhe1024 -v
63$ if $severity .ne. 1 then goto exit3 100$ if $severity .ne. 1 then goto exit3
64$ 101$
65$ write sys$output "test sslv2 with server authentication via BIO pair" 102$ write sys$output "test sslv2 with server authentication via BIO pair"
66$ mcr 'exe_dir'ssltest -bio_pair -ssl2 -server_auth "-CAfile" certs.tmp 103$ 'ssltest' -bio_pair -ssl2 -server_auth 'CA'
67$ if $severity .ne. 1 then goto exit3 104$ if $severity .ne. 1 then goto exit3
68$ 105$
69$ write sys$output "test sslv2 with client authentication via BIO pair" 106$ if .not. dsa_cert
70$ mcr 'exe_dir'ssltest -bio_pair -ssl2 -client_auth "-CAfile" certs.tmp 107$ then
71$ if $severity .ne. 1 then goto exit3 108$ write sys$output "test sslv2 with client authentication via BIO pair"
109$ 'ssltest' -bio_pair -ssl2 -client_auth 'CA'
110$ if $severity .ne. 1 then goto exit3
72$ 111$
73$ write sys$output "test sslv2 with both client and server authentication via BIO pair" 112$ write sys$output "test sslv2 with both client and server authentication via BIO pair"
74$ mcr 'exe_dir'ssltest -bio_pair -ssl2 -server_auth -client_auth "-CAfile" certs.tmp 113$ 'ssltest' -bio_pair -ssl2 -server_auth -client_auth 'CA'
75$ if $severity .ne. 1 then goto exit3 114$ if $severity .ne. 1 then goto exit3
115$ endif
76$ 116$
77$ write sys$output "test sslv3 via BIO pair" 117$ write sys$output "test sslv3 via BIO pair"
78$ mcr 'exe_dir'ssltest -bio_pair -ssl3 118$ 'ssltest' -bio_pair -ssl3
79$ if $severity .ne. 1 then goto exit3 119$ if $severity .ne. 1 then goto exit3
80$ 120$
81$ write sys$output "test sslv3 with server authentication via BIO pair" 121$ write sys$output "test sslv3 with server authentication via BIO pair"
82$ mcr 'exe_dir'ssltest -bio_pair -ssl3 -server_auth "-CAfile" certs.tmp 122$ 'ssltest' -bio_pair -ssl3 -server_auth 'CA'
83$ if $severity .ne. 1 then goto exit3 123$ if $severity .ne. 1 then goto exit3
84$ 124$
85$ write sys$output "test sslv3 with client authentication via BIO pair" 125$ write sys$output "test sslv3 with client authentication via BIO pair"
86$ mcr 'exe_dir'ssltest -bio_pair -ssl3 -client_auth "-CAfile" certs.tmp 126$ 'ssltest' -bio_pair -ssl3 -client_auth 'CA'
87$ if $severity .ne. 1 then goto exit3 127$ if $severity .ne. 1 then goto exit3
88 128
89$ write sys$output "test sslv3 with both client and server authentication via BIO pair" 129$ write sys$output "test sslv3 with both client and server authentication via BIO pair"
90$ mcr 'exe_dir'ssltest -bio_pair -ssl3 -server_auth -client_auth "-CAfile" certs.tmp 130$ 'ssltest' -bio_pair -ssl3 -server_auth -client_auth 'CA'
91$ if $severity .ne. 1 then goto exit3 131$ if $severity .ne. 1 then goto exit3
92$ 132$
93$ write sys$output "test sslv2/sslv3 via BIO pair" 133$ write sys$output "test sslv2/sslv3 via BIO pair"
94$ mcr 'exe_dir'ssltest 134$ 'ssltest'
95$ if $severity .ne. 1 then goto exit3 135$ if $severity .ne. 1 then goto exit3
96$ 136$
97$ write sys$output "test sslv2/sslv3 w/o DHE via BIO pair" 137$ if .not. dsa_cert
98$ mcr 'exe_dir'ssltest -bio_pair -no_dhe 138$ then
139$ write sys$output "test sslv2/sslv3 w/o DHE via BIO pair"
140$ 'ssltest' -bio_pair -no_dhe
141$ if $severity .ne. 1 then goto exit3
142$ endif
143$
144$ write sys$output "test sslv2/sslv3 with 1024 bit DHE via BIO pair"
145$ 'ssltest' -bio_pair -dhe1024dsa -v
99$ if $severity .ne. 1 then goto exit3 146$ if $severity .ne. 1 then goto exit3
100$ 147$
101$ write sys$output "test sslv2/sslv3 with server authentication" 148$ write sys$output "test sslv2/sslv3 with server authentication"
102$ mcr 'exe_dir'ssltest -bio_pair -server_auth "-CAfile" certs.tmp 149$ 'ssltest' -bio_pair -server_auth 'CA'
103$ if $severity .ne. 1 then goto exit3 150$ if $severity .ne. 1 then goto exit3
104$ 151$
105$ write sys$output "test sslv2/sslv3 with client authentication via BIO pair" 152$ write sys$output "test sslv2/sslv3 with client authentication via BIO pair"
106$ mcr 'exe_dir'ssltest -bio_pair -client_auth "-CAfile" certs.tmp 153$ 'ssltest' -bio_pair -client_auth 'CA'
107$ if $severity .ne. 1 then goto exit3 154$ if $severity .ne. 1 then goto exit3
108$ 155$
109$ write sys$output "test sslv2/sslv3 with both client and server authentication via BIO pair" 156$ write sys$output "test sslv2/sslv3 with both client and server authentication via BIO pair"
110$ mcr 'exe_dir'ssltest -bio_pair -server_auth -client_auth "-CAfile" certs.tmp 157$ 'ssltest' -bio_pair -server_auth -client_auth 'CA'
111$ if $severity .ne. 1 then goto exit3 158$ if $severity .ne. 1 then goto exit3
112$ 159$
160$!###########################################################################
161$
162$ write sys$output "test tls1 with 1024bit anonymous DH, multiple handshakes"
163$ 'ssltest' -v -bio_pair -tls1 -cipher "ADH" -dhe1024dsa -num 10 -f -time
164$ if $severity .ne. 1 then goto exit3
165$
166$ set noon
167$ define/user sys$output nla0:
168$ mcr 'exe_dir'openssl no-rsa
169$ save_severity=$SEVERITY
170$ set on
171$ if save_severity
172$ then
173$ write sys$output "skipping RSA tests"
174$ else
175$ write sys$output "test tls1 with 1024bit RSA, no DHE, multiple handshakes"
176$ mcr 'texe_dir'ssltest -v -bio_pair -tls1 -cert [-.apps]server2.pem -no_dhe -num 10 -f -time
177$ if $severity .ne. 1 then goto exit3
178$
179$ write sys$output "test tls1 with 1024bit RSA, 1024bit DHE, multiple handshakes"
180$ mcr 'texe_dir'ssltest -v -bio_pair -tls1 -cert [-.apps]server2.pem -dhe1024dsa -num 10 -f -time
181$ if $severity .ne. 1 then goto exit3
182$ endif
183$
113$ RET = 1 184$ RET = 1
114$ goto exit 185$ goto exit
115$ exit3: 186$ exit3:
116$ RET = 3 187$ RET = 3
117$ exit: 188$ exit:
118$ delete certs.tmp;* 189$ if p3 .eqs. "" then delete certs.tmp;*
119$ exit 'RET' 190$ exit 'RET'
diff --git a/src/lib/libssl/src/test/trsa.com b/src/lib/libssl/src/test/trsa.com
index 28add5eefd..6b6c318e2b 100644
--- a/src/lib/libssl/src/test/trsa.com
+++ b/src/lib/libssl/src/test/trsa.com
@@ -4,6 +4,17 @@ $ __arch := VAX
4$ if f$getsyi("cpu") .ge. 128 then __arch := AXP 4$ if f$getsyi("cpu") .ge. 128 then __arch := AXP
5$ exe_dir := sys$disk:[-.'__arch'.exe.apps] 5$ exe_dir := sys$disk:[-.'__arch'.exe.apps]
6$ 6$
7$ set noon
8$ define/user sys$output nla0:
9$ mcr 'exe_dir'openssl no-rsa
10$ save_severity=$SEVERITY
11$ set on
12$ if save_severity
13$ then
14$ write sys$output "skipping RSA conversion test"
15$ exit
16$ endif
17$
7$ cmd := mcr 'exe_dir'openssl rsa 18$ cmd := mcr 'exe_dir'openssl rsa
8$ 19$
9$ t := testrsa.pem 20$ t := testrsa.pem
diff --git a/src/lib/libssl/test/maketests.com b/src/lib/libssl/test/maketests.com
index b3bf8bb837..f7ff8fe407 100644
--- a/src/lib/libssl/test/maketests.com
+++ b/src/lib/libssl/test/maketests.com
@@ -910,8 +910,7 @@ $ ENDIF
910$! 910$!
911$! Time to check the contents, and to make sure we get the correct library. 911$! Time to check the contents, and to make sure we get the correct library.
912$! 912$!
913$ IF P4.EQS."SOCKETSHR" .OR. P4.EQS."MULTINET" .OR. P4.EQS."UCX" - 913$ IF P4.EQS."SOCKETSHR" .OR. P4.EQS."MULTINET" .OR. P4.EQS."UCX"
914 .OR. P4.EQS."TCPIP" .OR. P4.EQS."NONE"
915$ THEN 914$ THEN
916$! 915$!
917$! Check to see if SOCKETSHR was chosen 916$! Check to see if SOCKETSHR was chosen
@@ -960,32 +959,6 @@ $! Done with UCX
960$! 959$!
961$ ENDIF 960$ ENDIF
962$! 961$!
963$! Check to see if TCPIP was chosen
964$!
965$ IF P4.EQS."TCPIP"
966$ THEN
967$!
968$! Set the library to use TCPIP (post UCX).
969$!
970$ TCPIP_LIB = "SYS$DISK:[-.VMS]TCPIP_SHR_DECC.OPT/OPT"
971$!
972$! Done with TCPIP
973$!
974$ ENDIF
975$!
976$! Check to see if NONE was chosen
977$!
978$ IF P4.EQS."NONE"
979$ THEN
980$!
981$! Do not use a TCPIP library.
982$!
983$ TCPIP_LIB = ""
984$!
985$! Done with NONE
986$!
987$ ENDIF
988$!
989$! Print info 962$! Print info
990$! 963$!
991$ WRITE SYS$OUTPUT "TCP/IP library spec: ", TCPIP_LIB 964$ WRITE SYS$OUTPUT "TCP/IP library spec: ", TCPIP_LIB
@@ -1001,7 +974,6 @@ $ WRITE SYS$OUTPUT "The Option ",P4," Is Invalid. The Valid Options Are:"
1001$ WRITE SYS$OUTPUT "" 974$ WRITE SYS$OUTPUT ""
1002$ WRITE SYS$OUTPUT " SOCKETSHR : To link with SOCKETSHR TCP/IP library." 975$ WRITE SYS$OUTPUT " SOCKETSHR : To link with SOCKETSHR TCP/IP library."
1003$ WRITE SYS$OUTPUT " UCX : To link with UCX TCP/IP library." 976$ WRITE SYS$OUTPUT " UCX : To link with UCX TCP/IP library."
1004$ WRITE SYS$OUTPUT " TCPIP : To link with TCPIP (post UCX) TCP/IP library."
1005$ WRITE SYS$OUTPUT "" 977$ WRITE SYS$OUTPUT ""
1006$! 978$!
1007$! Time To EXIT. 979$! Time To EXIT.
diff --git a/src/lib/libssl/test/testgen.com b/src/lib/libssl/test/testgen.com
index 0e9029371a..5d28ebec72 100644
--- a/src/lib/libssl/test/testgen.com
+++ b/src/lib/libssl/test/testgen.com
@@ -16,23 +16,35 @@ $ set on
16$ 16$
17$ write sys$output "generating certificate request" 17$ write sys$output "generating certificate request"
18$ 18$
19$ write sys$output "There should be a 2 sequences of .'s and some +'s."
20$ write sys$output "There should not be more that at most 80 per line"
21$ write sys$output "This could take some time."
22$
23$ append/new nl: .rnd 19$ append/new nl: .rnd
24$ open/append random_file .rnd 20$ open/append random_file .rnd
25$ write random_file "string to make the random number generator think it has entropy" 21$ write random_file "string to make the random number generator think it has entropy"
26$ close random_file 22$ close random_file
27$ 23$
28$ mcr 'exe_dir'openssl req -config test.cnf -new -out testreq.pem 24$ set noon
25$ define/user sys$output nla0:
26$ mcr 'exe_dir'openssl no-rsa
27$ save_severity=$SEVERITY
28$ set on
29$ if save_severity
30$ then
31$ req_new="-newkey dsa:[-.apps]dsa512.pem"
32$ else
33$ req_new="-new"
34$ write sys$output "There should be a 2 sequences of .'s and some +'s."
35$ write sys$output "There should not be more that at most 80 per line"
36$ endif
37$
38$ write sys$output "This could take some time."
39$
40$ mcr 'exe_dir'openssl req -config test.cnf 'req_new' -out testreq.pem
29$ if $severity .ne. 1 41$ if $severity .ne. 1
30$ then 42$ then
31$ write sys$output "problems creating request" 43$ write sys$output "problems creating request"
32$ exit 3 44$ exit 3
33$ endif 45$ endif
34$ 46$
35$ mcr 'exe_dir'openssl req -verify -in testreq.pem -noout 47$ mcr 'exe_dir'openssl req -config test.cnf -verify -in testreq.pem -noout
36$ if $severity .ne. 1 48$ if $severity .ne. 1
37$ then 49$ then
38$ write sys$output "signature on req is wrong" 50$ write sys$output "signature on req is wrong"
diff --git a/src/lib/libssl/test/testss.com b/src/lib/libssl/test/testss.com
index ce2c4b43f6..685ae5043d 100644
--- a/src/lib/libssl/test/testss.com
+++ b/src/lib/libssl/test/testss.com
@@ -4,7 +4,7 @@ $ __arch := VAX
4$ if f$getsyi("cpu") .ge. 128 then __arch := AXP 4$ if f$getsyi("cpu") .ge. 128 then __arch := AXP
5$ exe_dir := sys$disk:[-.'__arch'.exe.apps] 5$ exe_dir := sys$disk:[-.'__arch'.exe.apps]
6$ 6$
7$ digest="-mdc2" 7$ digest="-md5"
8$ reqcmd := mcr 'exe_dir'openssl req 8$ reqcmd := mcr 'exe_dir'openssl req
9$ x509cmd := mcr 'exe_dir'openssl x509 'digest' 9$ x509cmd := mcr 'exe_dir'openssl x509 'digest'
10$ verifycmd := mcr 'exe_dir'openssl verify 10$ verifycmd := mcr 'exe_dir'openssl verify
@@ -23,7 +23,20 @@ $ Ucert="""certU.ss"""
23$ 23$
24$ write sys$output "" 24$ write sys$output ""
25$ write sys$output "make a certificate request using 'req'" 25$ write sys$output "make a certificate request using 'req'"
26$ 'reqcmd' -config 'CAconf' -out 'CAreq' -keyout 'CAkey' -new ! -out err.ss 26$
27$ set noon
28$ define/user sys$output nla0:
29$ mcr 'exe_dir'openssl no-rsa
30$ save_severity=$SEVERITY
31$ set on
32$ if save_severity
33$ then
34$ req_new="-newkey dsa:[-.apps]dsa512.pem"
35$ else
36$ req_new="-new"
37$ endif
38$
39$ 'reqcmd' -config 'CAconf' -out 'CAreq' -keyout 'CAkey' 'req_new' ! -out err.ss
27$ if $severity .ne. 1 40$ if $severity .ne. 1
28$ then 41$ then
29$ write sys$output "error using 'req' to generate a certificate request" 42$ write sys$output "error using 'req' to generate a certificate request"
@@ -73,7 +86,7 @@ $
73$ write sys$output "" 86$ write sys$output ""
74$ write sys$output "make another certificate request using 'req'" 87$ write sys$output "make another certificate request using 'req'"
75$ define /user sys$output err.ss 88$ define /user sys$output err.ss
76$ 'reqcmd' -config 'Uconf' -out 'Ureq' -keyout 'Ukey' -new 89$ 'reqcmd' -config 'Uconf' -out 'Ureq' -keyout 'Ukey' 'req_new'
77$ if $severity .ne. 1 90$ if $severity .ne. 1
78$ then 91$ then
79$ write sys$output "error using 'req' to generate a certificate request" 92$ write sys$output "error using 'req' to generate a certificate request"
diff --git a/src/lib/libssl/test/testssl.com b/src/lib/libssl/test/testssl.com
index 0b4b0a0ad3..785f262f5a 100644
--- a/src/lib/libssl/test/testssl.com
+++ b/src/lib/libssl/test/testssl.com
@@ -2,118 +2,189 @@ $! TESTSSL.COM
2$ 2$
3$ __arch := VAX 3$ __arch := VAX
4$ if f$getsyi("cpu") .ge. 128 then __arch := AXP 4$ if f$getsyi("cpu") .ge. 128 then __arch := AXP
5$ exe_dir := sys$disk:[-.'__arch'.exe.test] 5$ texe_dir := sys$disk:[-.'__arch'.exe.test]
6$ 6$ exe_dir := sys$disk:[-.'__arch'.exe.apps]
7$ copy/concatenate [-.certs]*.pem certs.tmp 7$
8$ if p1 .eqs. ""
9$ then
10$ key="[-.apps]server.pem"
11$ else
12$ key=p1
13$ endif
14$ if p2 .eqs. ""
15$ then
16$ cert="[-.apps]server.pem"
17$ else
18$ cert=p2
19$ endif
20$ ssltest := mcr 'texe_dir'ssltest -key 'key' -cert 'cert' -c_key 'key' -c_cert 'cert'
21$
22$ define/user sys$output testssl-x509-output.
23$ define/user sys$error nla0:
24$ mcr 'exe_dir'openssl x509 -in 'cert' -text -noout
25$ set noon
26$ define/user sys$error nla0:
27$ search/output=nla0: testssl-x509-output. "DSA Public Key"/exact
28$ if $severity .eq. 1
29$ then
30$ dsa_cert := YES
31$ else
32$ dsa_cert := NO
33$ endif
34$ set on
35$ delete testssl-x509-output.;*
36$
37$ if p3 .eqs. ""
38$ then
39$ copy/concatenate [-.certs]*.pem certs.tmp
40$ CA = """-CAfile"" certs.tmp"
41$ else
42$ CA = """-CAfile"" "+p3
43$ endif
44$
45$!###########################################################################
8$ 46$
9$ write sys$output "test sslv2" 47$ write sys$output "test sslv2"
10$ mcr 'exe_dir'ssltest -ssl2 48$ 'ssltest' -ssl2
11$ if $severity .ne. 1 then goto exit3 49$ if $severity .ne. 1 then goto exit3
12$ 50$
13$ write sys$output "test sslv2 with server authentication" 51$ write sys$output "test sslv2 with server authentication"
14$ mcr 'exe_dir'ssltest -ssl2 -server_auth "-CAfile" certs.tmp 52$ 'ssltest' -ssl2 -server_auth 'CA'
15$ if $severity .ne. 1 then goto exit3 53$ if $severity .ne. 1 then goto exit3
16$ 54$
17$ write sys$output "test sslv2 with client authentication" 55$ if .not. dsa_cert
18$ mcr 'exe_dir'ssltest -ssl2 -client_auth "-CAfile" certs.tmp 56$ then
19$ if $severity .ne. 1 then goto exit3 57$ write sys$output "test sslv2 with client authentication"
58$ 'ssltest' -ssl2 -client_auth 'CA'
59$ if $severity .ne. 1 then goto exit3
20$ 60$
21$ write sys$output "test sslv2 with both client and server authentication" 61$ write sys$output "test sslv2 with both client and server authentication"
22$ mcr 'exe_dir'ssltest -ssl2 -server_auth -client_auth "-CAfile" certs.tmp 62$ 'ssltest' -ssl2 -server_auth -client_auth 'CA'
23$ if $severity .ne. 1 then goto exit3 63$ if $severity .ne. 1 then goto exit3
64$ endif
24$ 65$
25$ write sys$output "test sslv3" 66$ write sys$output "test sslv3"
26$ mcr 'exe_dir'ssltest -ssl3 67$ 'ssltest' -ssl3
27$ if $severity .ne. 1 then goto exit3 68$ if $severity .ne. 1 then goto exit3
28$ 69$
29$ write sys$output "test sslv3 with server authentication" 70$ write sys$output "test sslv3 with server authentication"
30$ mcr 'exe_dir'ssltest -ssl3 -server_auth "-CAfile" certs.tmp 71$ 'ssltest' -ssl3 -server_auth 'CA'
31$ if $severity .ne. 1 then goto exit3 72$ if $severity .ne. 1 then goto exit3
32$ 73$
33$ write sys$output "test sslv3 with client authentication" 74$ write sys$output "test sslv3 with client authentication"
34$ mcr 'exe_dir'ssltest -ssl3 -client_auth "-CAfile" certs.tmp 75$ 'ssltest' -ssl3 -client_auth 'CA'
35$ if $severity .ne. 1 then goto exit3 76$ if $severity .ne. 1 then goto exit3
36$ 77$
37$ write sys$output "test sslv3 with both client and server authentication" 78$ write sys$output "test sslv3 with both client and server authentication"
38$ mcr 'exe_dir'ssltest -ssl3 -server_auth -client_auth "-CAfile" certs.tmp 79$ 'ssltest' -ssl3 -server_auth -client_auth 'CA'
39$ if $severity .ne. 1 then goto exit3 80$ if $severity .ne. 1 then goto exit3
40$ 81$
41$ write sys$output "test sslv2/sslv3" 82$ write sys$output "test sslv2/sslv3"
42$ mcr 'exe_dir'ssltest 83$ 'ssltest'
43$ if $severity .ne. 1 then goto exit3 84$ if $severity .ne. 1 then goto exit3
44$ 85$
45$ write sys$output "test sslv2/sslv3 with server authentication" 86$ write sys$output "test sslv2/sslv3 with server authentication"
46$ mcr 'exe_dir'ssltest -server_auth "-CAfile" certs.tmp 87$ 'ssltest' -server_auth 'CA'
47$ if $severity .ne. 1 then goto exit3 88$ if $severity .ne. 1 then goto exit3
48$ 89$
49$ write sys$output "test sslv2/sslv3 with client authentication" 90$ write sys$output "test sslv2/sslv3 with client authentication"
50$ mcr 'exe_dir'ssltest -client_auth "-CAfile" certs.tmp 91$ 'ssltest' -client_auth 'CA'
51$ if $severity .ne. 1 then goto exit3 92$ if $severity .ne. 1 then goto exit3
52$ 93$
53$ write sys$output "test sslv2/sslv3 with both client and server authentication" 94$ write sys$output "test sslv2/sslv3 with both client and server authentication"
54$ mcr 'exe_dir'ssltest -server_auth -client_auth "-CAfile" certs.tmp 95$ 'ssltest' -server_auth -client_auth 'CA'
55$ if $severity .ne. 1 then goto exit3 96$ if $severity .ne. 1 then goto exit3
56$ 97$
57$ write sys$output "test sslv2 via BIO pair" 98$ write sys$output "test sslv2 via BIO pair"
58$ mcr 'exe_dir'ssltest -bio_pair -ssl2 99$ 'ssltest' -bio_pair -ssl2
59$ if $severity .ne. 1 then goto exit3
60$
61$ write sys$output "test sslv2/sslv3 with 1024 bit DHE via BIO pair"
62$ mcr 'exe_dir'ssltest -bio_pair -dhe1024 -v
63$ if $severity .ne. 1 then goto exit3 100$ if $severity .ne. 1 then goto exit3
64$ 101$
65$ write sys$output "test sslv2 with server authentication via BIO pair" 102$ write sys$output "test sslv2 with server authentication via BIO pair"
66$ mcr 'exe_dir'ssltest -bio_pair -ssl2 -server_auth "-CAfile" certs.tmp 103$ 'ssltest' -bio_pair -ssl2 -server_auth 'CA'
67$ if $severity .ne. 1 then goto exit3 104$ if $severity .ne. 1 then goto exit3
68$ 105$
69$ write sys$output "test sslv2 with client authentication via BIO pair" 106$ if .not. dsa_cert
70$ mcr 'exe_dir'ssltest -bio_pair -ssl2 -client_auth "-CAfile" certs.tmp 107$ then
71$ if $severity .ne. 1 then goto exit3 108$ write sys$output "test sslv2 with client authentication via BIO pair"
109$ 'ssltest' -bio_pair -ssl2 -client_auth 'CA'
110$ if $severity .ne. 1 then goto exit3
72$ 111$
73$ write sys$output "test sslv2 with both client and server authentication via BIO pair" 112$ write sys$output "test sslv2 with both client and server authentication via BIO pair"
74$ mcr 'exe_dir'ssltest -bio_pair -ssl2 -server_auth -client_auth "-CAfile" certs.tmp 113$ 'ssltest' -bio_pair -ssl2 -server_auth -client_auth 'CA'
75$ if $severity .ne. 1 then goto exit3 114$ if $severity .ne. 1 then goto exit3
115$ endif
76$ 116$
77$ write sys$output "test sslv3 via BIO pair" 117$ write sys$output "test sslv3 via BIO pair"
78$ mcr 'exe_dir'ssltest -bio_pair -ssl3 118$ 'ssltest' -bio_pair -ssl3
79$ if $severity .ne. 1 then goto exit3 119$ if $severity .ne. 1 then goto exit3
80$ 120$
81$ write sys$output "test sslv3 with server authentication via BIO pair" 121$ write sys$output "test sslv3 with server authentication via BIO pair"
82$ mcr 'exe_dir'ssltest -bio_pair -ssl3 -server_auth "-CAfile" certs.tmp 122$ 'ssltest' -bio_pair -ssl3 -server_auth 'CA'
83$ if $severity .ne. 1 then goto exit3 123$ if $severity .ne. 1 then goto exit3
84$ 124$
85$ write sys$output "test sslv3 with client authentication via BIO pair" 125$ write sys$output "test sslv3 with client authentication via BIO pair"
86$ mcr 'exe_dir'ssltest -bio_pair -ssl3 -client_auth "-CAfile" certs.tmp 126$ 'ssltest' -bio_pair -ssl3 -client_auth 'CA'
87$ if $severity .ne. 1 then goto exit3 127$ if $severity .ne. 1 then goto exit3
88 128
89$ write sys$output "test sslv3 with both client and server authentication via BIO pair" 129$ write sys$output "test sslv3 with both client and server authentication via BIO pair"
90$ mcr 'exe_dir'ssltest -bio_pair -ssl3 -server_auth -client_auth "-CAfile" certs.tmp 130$ 'ssltest' -bio_pair -ssl3 -server_auth -client_auth 'CA'
91$ if $severity .ne. 1 then goto exit3 131$ if $severity .ne. 1 then goto exit3
92$ 132$
93$ write sys$output "test sslv2/sslv3 via BIO pair" 133$ write sys$output "test sslv2/sslv3 via BIO pair"
94$ mcr 'exe_dir'ssltest 134$ 'ssltest'
95$ if $severity .ne. 1 then goto exit3 135$ if $severity .ne. 1 then goto exit3
96$ 136$
97$ write sys$output "test sslv2/sslv3 w/o DHE via BIO pair" 137$ if .not. dsa_cert
98$ mcr 'exe_dir'ssltest -bio_pair -no_dhe 138$ then
139$ write sys$output "test sslv2/sslv3 w/o DHE via BIO pair"
140$ 'ssltest' -bio_pair -no_dhe
141$ if $severity .ne. 1 then goto exit3
142$ endif
143$
144$ write sys$output "test sslv2/sslv3 with 1024 bit DHE via BIO pair"
145$ 'ssltest' -bio_pair -dhe1024dsa -v
99$ if $severity .ne. 1 then goto exit3 146$ if $severity .ne. 1 then goto exit3
100$ 147$
101$ write sys$output "test sslv2/sslv3 with server authentication" 148$ write sys$output "test sslv2/sslv3 with server authentication"
102$ mcr 'exe_dir'ssltest -bio_pair -server_auth "-CAfile" certs.tmp 149$ 'ssltest' -bio_pair -server_auth 'CA'
103$ if $severity .ne. 1 then goto exit3 150$ if $severity .ne. 1 then goto exit3
104$ 151$
105$ write sys$output "test sslv2/sslv3 with client authentication via BIO pair" 152$ write sys$output "test sslv2/sslv3 with client authentication via BIO pair"
106$ mcr 'exe_dir'ssltest -bio_pair -client_auth "-CAfile" certs.tmp 153$ 'ssltest' -bio_pair -client_auth 'CA'
107$ if $severity .ne. 1 then goto exit3 154$ if $severity .ne. 1 then goto exit3
108$ 155$
109$ write sys$output "test sslv2/sslv3 with both client and server authentication via BIO pair" 156$ write sys$output "test sslv2/sslv3 with both client and server authentication via BIO pair"
110$ mcr 'exe_dir'ssltest -bio_pair -server_auth -client_auth "-CAfile" certs.tmp 157$ 'ssltest' -bio_pair -server_auth -client_auth 'CA'
111$ if $severity .ne. 1 then goto exit3 158$ if $severity .ne. 1 then goto exit3
112$ 159$
160$!###########################################################################
161$
162$ write sys$output "test tls1 with 1024bit anonymous DH, multiple handshakes"
163$ 'ssltest' -v -bio_pair -tls1 -cipher "ADH" -dhe1024dsa -num 10 -f -time
164$ if $severity .ne. 1 then goto exit3
165$
166$ set noon
167$ define/user sys$output nla0:
168$ mcr 'exe_dir'openssl no-rsa
169$ save_severity=$SEVERITY
170$ set on
171$ if save_severity
172$ then
173$ write sys$output "skipping RSA tests"
174$ else
175$ write sys$output "test tls1 with 1024bit RSA, no DHE, multiple handshakes"
176$ mcr 'texe_dir'ssltest -v -bio_pair -tls1 -cert [-.apps]server2.pem -no_dhe -num 10 -f -time
177$ if $severity .ne. 1 then goto exit3
178$
179$ write sys$output "test tls1 with 1024bit RSA, 1024bit DHE, multiple handshakes"
180$ mcr 'texe_dir'ssltest -v -bio_pair -tls1 -cert [-.apps]server2.pem -dhe1024dsa -num 10 -f -time
181$ if $severity .ne. 1 then goto exit3
182$ endif
183$
113$ RET = 1 184$ RET = 1
114$ goto exit 185$ goto exit
115$ exit3: 186$ exit3:
116$ RET = 3 187$ RET = 3
117$ exit: 188$ exit:
118$ delete certs.tmp;* 189$ if p3 .eqs. "" then delete certs.tmp;*
119$ exit 'RET' 190$ exit 'RET'
diff --git a/src/lib/libssl/test/trsa.com b/src/lib/libssl/test/trsa.com
index 28add5eefd..6b6c318e2b 100644
--- a/src/lib/libssl/test/trsa.com
+++ b/src/lib/libssl/test/trsa.com
@@ -4,6 +4,17 @@ $ __arch := VAX
4$ if f$getsyi("cpu") .ge. 128 then __arch := AXP 4$ if f$getsyi("cpu") .ge. 128 then __arch := AXP
5$ exe_dir := sys$disk:[-.'__arch'.exe.apps] 5$ exe_dir := sys$disk:[-.'__arch'.exe.apps]
6$ 6$
7$ set noon
8$ define/user sys$output nla0:
9$ mcr 'exe_dir'openssl no-rsa
10$ save_severity=$SEVERITY
11$ set on
12$ if save_severity
13$ then
14$ write sys$output "skipping RSA conversion test"
15$ exit
16$ endif
17$
7$ cmd := mcr 'exe_dir'openssl rsa 18$ cmd := mcr 'exe_dir'openssl rsa
8$ 19$
9$ t := testrsa.pem 20$ t := testrsa.pem
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-21 01:10:50 +0000