summaryrefslogtreecommitdiff
path: root/lib/libssl/test
diff options
context:
space:
mode:
Diffstat (limited to 'lib/libssl/test')
-rw-r--r--lib/libssl/test/bctest2
-rw-r--r--lib/libssl/test/maketests.com6
-rw-r--r--lib/libssl/test/tcrl7
-rw-r--r--lib/libssl/test/testca6
-rw-r--r--lib/libssl/test/testenc16
-rw-r--r--lib/libssl/test/tests.com15
-rw-r--r--lib/libssl/test/tpkcs77
-rw-r--r--lib/libssl/test/tpkcs7d7
-rw-r--r--lib/libssl/test/treq9
-rw-r--r--lib/libssl/test/trsa7
-rw-r--r--lib/libssl/test/tsid7
-rw-r--r--lib/libssl/test/tx5097
12 files changed, 30 insertions, 66 deletions
diff --git a/lib/libssl/test/bctest b/lib/libssl/test/bctest
index e81fc0733a6..bdb3218f7ac 100644
--- a/lib/libssl/test/bctest
+++ b/lib/libssl/test/bctest
@@ -1,6 +1,6 @@
#!/bin/sh
-# This script is used by test/Makefile to check whether a sane 'bc'
+# This script is used by test/Makefile.ssl to check whether a sane 'bc'
# is installed.
# ('make test_bn' should not try to run 'bc' if it does not exist or if
# it is a broken 'bc' version that is known to cause trouble.)
diff --git a/lib/libssl/test/maketests.com b/lib/libssl/test/maketests.com
index 94621a655b7..14cbf060884 100644
--- a/lib/libssl/test/maketests.com
+++ b/lib/libssl/test/maketests.com
@@ -127,9 +127,11 @@ $ GOSUB CHECK_OPT_FILE
$!
$! Define The TEST Files.
$!
-$ TEST_FILES = "BNTEST,ECTEST,IDEATEST,MD2TEST,MD4TEST,MD5TEST,HMACTEST,"+ -
+$ TEST_FILES = "BNTEST,ECTEST,ECDSATEST,ECDHTEST,IDEATEST,"+ -
+ "MD2TEST,MD4TEST,MD5TEST,HMACTEST,"+ -
"RC2TEST,RC4TEST,RC5TEST,"+ -
- "DESTEST,SHATEST,SHA1TEST,MDC2TEST,RMDTEST,"+ -
+ "DESTEST,SHATEST,SHA1TEST,SHA256T,SHA512T,"+ -
+ "MDC2TEST,RMDTEST,"+ -
"RANDTEST,DHTEST,ENGINETEST,"+ -
"BFTEST,CASTTEST,SSLTEST,EXPTEST,DSATEST,RSA_TEST,"+ -
"EVP_TEST"
diff --git a/lib/libssl/test/tcrl b/lib/libssl/test/tcrl
index 3ffed12a036..055269eab8d 100644
--- a/lib/libssl/test/tcrl
+++ b/lib/libssl/test/tcrl
@@ -1,12 +1,5 @@
#!/bin/sh
-if test "$OSTYPE" = msdosdjgpp; then
- PATH=../apps\;$PATH
-else
- PATH=../apps:$PATH
-fi
-export PATH
-
cmd='../util/shlib_wrap.sh ../apps/openssl crl'
if [ "$1"x != "x" ]; then
diff --git a/lib/libssl/test/testca b/lib/libssl/test/testca
index 5b2faa78f15..b109cfe271f 100644
--- a/lib/libssl/test/testca
+++ b/lib/libssl/test/testca
@@ -2,16 +2,16 @@
SH="/bin/sh"
if test "$OSTYPE" = msdosdjgpp; then
- PATH=./apps\;../apps\;$PATH
+ PATH="../apps\;$PATH"
else
- PATH=../apps:$PATH
+ PATH="../apps:$PATH"
fi
export SH PATH
SSLEAY_CONFIG="-config CAss.cnf"
export SSLEAY_CONFIG
-OPENSSL="`pwd`/../util/shlib_wrap.sh openssl"
+OPENSSL="`pwd`/../util/opensslwrap.sh"
export OPENSSL
/bin/rm -fr demoCA
diff --git a/lib/libssl/test/testenc b/lib/libssl/test/testenc
index 4571ea28754..f5ce7c0c457 100644
--- a/lib/libssl/test/testenc
+++ b/lib/libssl/test/testenc
@@ -7,8 +7,8 @@ cmd="../util/shlib_wrap.sh ../apps/openssl"
cat $testsrc >$test;
echo cat
-$cmd enc -non-fips-allow < $test > $test.cipher
-$cmd enc -non-fips-allow < $test.cipher >$test.clear
+$cmd enc < $test > $test.cipher
+$cmd enc < $test.cipher >$test.clear
cmp $test $test.clear
if [ $? != 0 ]
then
@@ -17,8 +17,8 @@ else
/bin/rm $test.cipher $test.clear
fi
echo base64
-$cmd enc -non-fips-allow -a -e < $test > $test.cipher
-$cmd enc -non-fips-allow -a -d < $test.cipher >$test.clear
+$cmd enc -a -e < $test > $test.cipher
+$cmd enc -a -d < $test.cipher >$test.clear
cmp $test $test.clear
if [ $? != 0 ]
then
@@ -30,8 +30,8 @@ fi
for i in `$cmd list-cipher-commands`
do
echo $i
- $cmd $i -non-fips-allow -bufsize 113 -e -k test < $test > $test.$i.cipher
- $cmd $i -non-fips-allow -bufsize 157 -d -k test < $test.$i.cipher >$test.$i.clear
+ $cmd $i -bufsize 113 -e -k test < $test > $test.$i.cipher
+ $cmd $i -bufsize 157 -d -k test < $test.$i.cipher >$test.$i.clear
cmp $test $test.$i.clear
if [ $? != 0 ]
then
@@ -41,8 +41,8 @@ do
fi
echo $i base64
- $cmd $i -non-fips-allow -bufsize 113 -a -e -k test < $test > $test.$i.cipher
- $cmd $i -non-fips-allow -bufsize 157 -a -d -k test < $test.$i.cipher >$test.$i.clear
+ $cmd $i -bufsize 113 -a -e -k test < $test > $test.$i.cipher
+ $cmd $i -bufsize 157 -a -d -k test < $test.$i.cipher >$test.$i.clear
cmp $test $test.$i.clear
if [ $? != 0 ]
then
diff --git a/lib/libssl/test/tests.com b/lib/libssl/test/tests.com
index 07a3c7f16df..056082e7fe7 100644
--- a/lib/libssl/test/tests.com
+++ b/lib/libssl/test/tests.com
@@ -22,14 +22,17 @@ $ tests := -
test_des,test_idea,test_sha,test_md4,test_md5,test_hmac,-
test_md2,test_mdc2,-
test_rmd,test_rc2,test_rc4,test_rc5,test_bf,test_cast,test_rd,-
- test_rand,test_bn,test_ec,test_enc,test_x509,test_rsa,test_crl,test_sid,-
+ test_rand,test_bn,test_ec,test_ecdsa,test_ecdh,-
+ test_enc,test_x509,test_rsa,test_crl,test_sid,-
test_gen,test_req,test_pkcs7,test_verify,test_dh,test_dsa,-
- test_ss,test_ca,test_engine,test_ssl,test_evp
+ test_ss,test_ca,test_engine,test_evp,test_ssl
$ endif
$ tests = f$edit(tests,"COLLAPSE")
$
$ BNTEST := bntest
$ ECTEST := ectest
+$ ECDSATEST := ecdsatest
+$ ECDHTEST := ecdhtest
$ EXPTEST := exptest
$ IDEATEST := ideatest
$ SHATEST := shatest
@@ -182,6 +185,14 @@ $ test_ec:
$ write sys$output "test elliptic curves"
$ mcr 'texe_dir''ectest'
$ return
+$ test_ecdsa:
+$ write sys$output "test ecdsa"
+$ mcr 'texe_dir''ecdsatest'
+$ return
+$ test_ecdh:
+$ write sys$output "test ecdh"
+$ mcr 'texe_dir''ecdhtest'
+$ return
$ test_verify:
$ write sys$output "The following command should have some OK's and some failures"
$ write sys$output "There are definitly a few expired certificates"
diff --git a/lib/libssl/test/tpkcs7 b/lib/libssl/test/tpkcs7
index 79bb6e0edff..3e435ffbf9f 100644
--- a/lib/libssl/test/tpkcs7
+++ b/lib/libssl/test/tpkcs7
@@ -1,12 +1,5 @@
#!/bin/sh
-if test "$OSTYPE" = msdosdjgpp; then
- PATH=../apps\;$PATH
-else
- PATH=../apps:$PATH
-fi
-export PATH
-
cmd='../util/shlib_wrap.sh ../apps/openssl pkcs7'
if [ "$1"x != "x" ]; then
diff --git a/lib/libssl/test/tpkcs7d b/lib/libssl/test/tpkcs7d
index 20394b34c4f..64fc28e88f0 100644
--- a/lib/libssl/test/tpkcs7d
+++ b/lib/libssl/test/tpkcs7d
@@ -1,12 +1,5 @@
#!/bin/sh
-if test "$OSTYPE" = msdosdjgpp; then
- PATH=../apps\;$PATH
-else
- PATH=../apps:$PATH
-fi
-export PATH
-
cmd='../util/shlib_wrap.sh ../apps/openssl pkcs7'
if [ "$1"x != "x" ]; then
diff --git a/lib/libssl/test/treq b/lib/libssl/test/treq
index 7e020210a54..77f37dcf3a9 100644
--- a/lib/libssl/test/treq
+++ b/lib/libssl/test/treq
@@ -1,12 +1,5 @@
#!/bin/sh
-if test "$OSTYPE" = msdosdjgpp; then
- PATH=../apps\;$PATH
-else
- PATH=../apps:$PATH
-fi
-export PATH
-
cmd='../util/shlib_wrap.sh ../apps/openssl req -config ../apps/openssl.cnf'
if [ "$1"x != "x" ]; then
@@ -15,7 +8,7 @@ else
t=testreq.pem
fi
-if $cmd -in $t -inform p -noout -text | fgrep 'Unknown Public Key'; then
+if $cmd -in $t -inform p -noout -text 2>&1 | fgrep -i 'Unknown Public Key'; then
echo "skipping req conversion test for $t"
exit 0
fi
diff --git a/lib/libssl/test/trsa b/lib/libssl/test/trsa
index 67b4a988410..249ac1ddcc6 100644
--- a/lib/libssl/test/trsa
+++ b/lib/libssl/test/trsa
@@ -1,12 +1,5 @@
#!/bin/sh
-if test "$OSTYPE" = msdosdjgpp; then
- PATH=../apps\;$PATH
-else
- PATH=../apps:$PATH
-fi
-export PATH
-
if ../util/shlib_wrap.sh ../apps/openssl no-rsa; then
echo skipping rsa conversion test
exit 0
diff --git a/lib/libssl/test/tsid b/lib/libssl/test/tsid
index fb4a7213b91..6adbd531ce0 100644
--- a/lib/libssl/test/tsid
+++ b/lib/libssl/test/tsid
@@ -1,12 +1,5 @@
#!/bin/sh
-if test "$OSTYPE" = msdosdjgpp; then
- PATH=../apps\;$PATH
-else
- PATH=../apps:$PATH
-fi
-export PATH
-
cmd='../util/shlib_wrap.sh ../apps/openssl sess_id'
if [ "$1"x != "x" ]; then
diff --git a/lib/libssl/test/tx509 b/lib/libssl/test/tx509
index 1b9c8661f3c..4a15b98d17d 100644
--- a/lib/libssl/test/tx509
+++ b/lib/libssl/test/tx509
@@ -1,12 +1,5 @@
#!/bin/sh
-if test "$OSTYPE" = msdosdjgpp; then
- PATH=../apps\;$PATH
-else
- PATH=../apps:$PATH
-fi
-export PATH
-
cmd='../util/shlib_wrap.sh ../apps/openssl x509'
if [ "$1"x != "x" ]; then
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 19:48:38 +0000