New minty openssl version

5 files changed, 12 insertions, 12 deletions

diff --git a/regress/lib/libssl/test_client.sh b/regress/lib/libssl/test_client.sh
index 36a8f84532b..8b24e3f8a7b 100644
--- a/regress/lib/libssl/test_client.sh
+++ b/regress/lib/libssl/test_client.sh
@@ -8,4 +8,4 @@ echo type in this window after ssl negotiation and your output should
 echo be echoed by the server. 
 echo
 echo
-/usr/sbin/ssleay s_client -tls1
+/usr/sbin/openssl s_client -tls1
diff --git a/regress/lib/libssl/test_server.sh b/regress/lib/libssl/test_server.sh
index 5467c524590..7d40270f13f 100644
--- a/regress/lib/libssl/test_server.sh
+++ b/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
 echo should echo in this window
 echo
 echo
-/usr/sbin/ssleay s_server -tls1 -key testdsa.key -cert testdsa.pem
+/usr/sbin/openssl s_server -tls1 -key testdsa.key -cert testdsa.pem
diff --git a/regress/lib/libssl/testdsa.sh b/regress/lib/libssl/testdsa.sh
index dc5d7b97b56..e3afbfe40c5 100644
--- a/regress/lib/libssl/testdsa.sh
+++ b/regress/lib/libssl/testdsa.sh
@@ -1,25 +1,25 @@
 #!/bin/sh
 
-#Test DSA certificate generation of ssleay
+#Test DSA certificate generation of openssl
 
 cd $1
 
 # Generate DSA paramter set
-ssleay dsaparam 512 -out dsa512.pem
+openssl dsaparam 512 -out dsa512.pem
 if [ $? != 0 ]; then
         exit 1;
 fi
 
 
 # Denerate a DSA certificate
-ssleay req -config $2/ssleay.cnf -x509 -newkey dsa:dsa512.pem -out testdsa.pem -keyout testdsa.key
+openssl req -config $2/openssl.cnf -x509 -newkey dsa:dsa512.pem -out testdsa.pem -keyout testdsa.key
 if [ $? != 0 ]; then
         exit 1;
 fi
 
 
 # Now check the certificate
-ssleay x509 -text -in testdsa.pem
+openssl x509 -text -in testdsa.pem
 if [ $? != 0 ]; then
         exit 1;
 fi
diff --git a/regress/lib/libssl/testenc.sh b/regress/lib/libssl/testenc.sh
index fa5cfed7764..c30993449f5 100644
--- a/regress/lib/libssl/testenc.sh
+++ b/regress/lib/libssl/testenc.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-testsrc=$2/ssleay.cnf
+testsrc=$2/openssl.cnf
 test=$1/p
 cmd=/usr/sbin/openssl
 
diff --git a/regress/lib/libssl/testrsa.sh b/regress/lib/libssl/testrsa.sh
index 3f4c328acd3..75e205a975e 100644
--- a/regress/lib/libssl/testrsa.sh
+++ b/regress/lib/libssl/testrsa.sh
@@ -1,11 +1,11 @@
 #!/bin/sh
 
-#Test RSA certificate generation of ssleay
+#Test RSA certificate generation of openssl
 
 echo 
 echo RSA paramters test - NOTE THAT THIS WILL ONLY WORK IF YOU HAVE
 echo compiled libssl with the src-patent tree, currently living in 
-echo ~ryker/src-patent.tar.gz on cvs. 
+echo ~beck/src-patent.tar.gz on cvs. 
 echo
 echo This will *not* work with what\'s in the tree, rsa is not in that.
 echo
@@ -14,21 +14,21 @@ sleep 3
 cd $1
 
 # Generate RSA private key
-ssleay genrsa -out rsakey.pem
+openssl genrsa -out rsakey.pem
 if [ $? != 0 ]; then
         exit 1;
 fi
 
 
 # Denerate an RSA certificate
-ssleay req -config $2/ssleay.cnf -key rsakey.pem -new -x509 -days 365 -out rsacert.pem
+openssl req -config $2/openssl.cnf -key rsakey.pem -new -x509 -days 365 -out rsacert.pem
 if [ $? != 0 ]; then
         exit 1;
 fi
 
 
 # Now check the certificate
-ssleay x509 -text -in rsacert.pem
+openssl x509 -text -in rsacert.pem
 if [ $? != 0 ]; then
         exit 1;
 fi