summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/regress/lib/libssl/test_client.sh2
-rw-r--r--src/regress/lib/libssl/test_server.sh2
-rw-r--r--src/regress/lib/libssl/testdsa.sh8
-rw-r--r--src/regress/lib/libssl/testenc.sh2
-rw-r--r--src/regress/lib/libssl/testrsa.sh10
5 files changed, 12 insertions, 12 deletions
diff --git a/src/regress/lib/libssl/test_client.sh b/src/regress/lib/libssl/test_client.sh
index 36a8f84532..8b24e3f8a7 100644
--- a/src/regress/lib/libssl/test_client.sh
+++ b/src/regress/lib/libssl/test_client.sh
@@ -8,4 +8,4 @@ echo type in this window after ssl negotiation and your output should
8echo be echoed by the server. 8echo be echoed by the server.
9echo 9echo
10echo 10echo
11/usr/sbin/ssleay s_client -tls1 11/usr/sbin/openssl s_client -tls1
diff --git a/src/regress/lib/libssl/test_server.sh b/src/regress/lib/libssl/test_server.sh
index 5467c52459..7d40270f13 100644
--- a/src/regress/lib/libssl/test_server.sh
+++ b/src/regress/lib/libssl/test_server.sh
@@ -6,4 +6,4 @@ echo see the results of the ssl negotiation, and stuff you type in the client
6echo should echo in this window 6echo should echo in this window
7echo 7echo
8echo 8echo
9/usr/sbin/ssleay s_server -tls1 -key testdsa.key -cert testdsa.pem 9/usr/sbin/openssl s_server -tls1 -key testdsa.key -cert testdsa.pem
diff --git a/src/regress/lib/libssl/testdsa.sh b/src/regress/lib/libssl/testdsa.sh
index dc5d7b97b5..e3afbfe40c 100644
--- a/src/regress/lib/libssl/testdsa.sh
+++ b/src/regress/lib/libssl/testdsa.sh
@@ -1,25 +1,25 @@
1#!/bin/sh 1#!/bin/sh
2 2
3#Test DSA certificate generation of ssleay 3#Test DSA certificate generation of openssl
4 4
5cd $1 5cd $1
6 6
7# Generate DSA paramter set 7# Generate DSA paramter set
8ssleay dsaparam 512 -out dsa512.pem 8openssl dsaparam 512 -out dsa512.pem
9if [ $? != 0 ]; then 9if [ $? != 0 ]; then
10 exit 1; 10 exit 1;
11fi 11fi
12 12
13 13
14# Denerate a DSA certificate 14# Denerate a DSA certificate
15ssleay req -config $2/ssleay.cnf -x509 -newkey dsa:dsa512.pem -out testdsa.pem -keyout testdsa.key 15openssl req -config $2/openssl.cnf -x509 -newkey dsa:dsa512.pem -out testdsa.pem -keyout testdsa.key
16if [ $? != 0 ]; then 16if [ $? != 0 ]; then
17 exit 1; 17 exit 1;
18fi 18fi
19 19
20 20
21# Now check the certificate 21# Now check the certificate
22ssleay x509 -text -in testdsa.pem 22openssl x509 -text -in testdsa.pem
23if [ $? != 0 ]; then 23if [ $? != 0 ]; then
24 exit 1; 24 exit 1;
25fi 25fi
diff --git a/src/regress/lib/libssl/testenc.sh b/src/regress/lib/libssl/testenc.sh
index fa5cfed776..c30993449f 100644
--- a/src/regress/lib/libssl/testenc.sh
+++ b/src/regress/lib/libssl/testenc.sh
@@ -1,6 +1,6 @@
1#!/bin/sh 1#!/bin/sh
2 2
3testsrc=$2/ssleay.cnf 3testsrc=$2/openssl.cnf
4test=$1/p 4test=$1/p
5cmd=/usr/sbin/openssl 5cmd=/usr/sbin/openssl
6 6
diff --git a/src/regress/lib/libssl/testrsa.sh b/src/regress/lib/libssl/testrsa.sh
index 3f4c328acd..75e205a975 100644
--- a/src/regress/lib/libssl/testrsa.sh
+++ b/src/regress/lib/libssl/testrsa.sh
@@ -1,11 +1,11 @@
1#!/bin/sh 1#!/bin/sh
2 2
3#Test RSA certificate generation of ssleay 3#Test RSA certificate generation of openssl
4 4
5echo 5echo
6echo RSA paramters test - NOTE THAT THIS WILL ONLY WORK IF YOU HAVE 6echo RSA paramters test - NOTE THAT THIS WILL ONLY WORK IF YOU HAVE
7echo compiled libssl with the src-patent tree, currently living in 7echo compiled libssl with the src-patent tree, currently living in
8echo ~ryker/src-patent.tar.gz on cvs. 8echo ~beck/src-patent.tar.gz on cvs.
9echo 9echo
10echo This will *not* work with what\'s in the tree, rsa is not in that. 10echo This will *not* work with what\'s in the tree, rsa is not in that.
11echo 11echo
@@ -14,21 +14,21 @@ sleep 3
14cd $1 14cd $1
15 15
16# Generate RSA private key 16# Generate RSA private key
17ssleay genrsa -out rsakey.pem 17openssl genrsa -out rsakey.pem
18if [ $? != 0 ]; then 18if [ $? != 0 ]; then
19 exit 1; 19 exit 1;
20fi 20fi
21 21
22 22
23# Denerate an RSA certificate 23# Denerate an RSA certificate
24ssleay req -config $2/ssleay.cnf -key rsakey.pem -new -x509 -days 365 -out rsacert.pem 24openssl req -config $2/openssl.cnf -key rsakey.pem -new -x509 -days 365 -out rsacert.pem
25if [ $? != 0 ]; then 25if [ $? != 0 ]; then
26 exit 1; 26 exit 1;
27fi 27fi
28 28
29 29
30# Now check the certificate 30# Now check the certificate
31ssleay x509 -text -in rsacert.pem 31openssl x509 -text -in rsacert.pem
32if [ $? != 0 ]; then 32if [ $? != 0 ]; then
33 exit 1; 33 exit 1;
34fi 34fi