11 files changed, 16 insertions, 20 deletions
diff --git a/regress/lib/libcrypto/sha2/Makefile b/regress/lib/libcrypto/sha2/Makefile
index 2edf10b0f49..e2bbb02d15a 100644
--- a/regress/lib/libcrypto/sha2/Makefile
+++ b/regress/lib/libcrypto/sha2/Makefile
@@ -1,7 +1,7 @@
-#	$OpenBSD: Makefile,v 1.1 2014/05/02 19:27:06 miod Exp $
+#	$OpenBSD: Makefile,v 1.2 2014/08/26 17:50:07 jsing Exp $
 
 REGRESS_TARGETS=regress-sha2
-OPENSSL=/usr/sbin/openssl
+OPENSSL=/usr/bin/openssl
 
 HASHES= \
 	sha224 \
diff --git a/regress/usr.bin/Makefile b/regress/usr.bin/Makefile
index a0813d9df4c..9536d7e7b1c 100644
--- a/regress/usr.bin/Makefile
+++ b/regress/usr.bin/Makefile
@@ -1,8 +1,8 @@
-#	$OpenBSD: Makefile,v 1.29 2014/07/03 21:12:24 miod Exp $
+#	$OpenBSD: Makefile,v 1.30 2014/08/26 17:50:07 jsing Exp $
 #	$NetBSD: Makefile,v 1.1 1997/12/30 23:27:11 cgd Exp $
 
 SUBDIR+= basename bc dc diff diff3 dirname file grep gzip gzsig
-SUBDIR+= m4 mandoc sdiff sed signify sort tsort
+SUBDIR+= m4 mandoc openssl sdiff sed signify sort tsort
 SUBDIR+= xargs
 
 .if defined(REGRESS_FULL) || make(clean) || make(cleandir) || make(obj)
diff --git a/regress/usr.sbin/openssl/Makefile b/regress/usr.bin/openssl/Makefile
index 4f4e3d13a10..800e2fd0611 100644
--- a/regress/usr.sbin/openssl/Makefile
+++ b/regress/usr.bin/openssl/Makefile
@@ -1,10 +1,10 @@
-#	$OpenBSD: Makefile,v 1.1 2014/05/24 13:32:46 jsing Exp $
+#	$OpenBSD: Makefile,v 1.1 2014/08/26 17:50:07 jsing Exp $
 
 CLEANFILES+= testdsa.key testdsa.pem rsakey.pem rsacert.pem dsa512.pem
 
 REGRESS_TARGETS=ssl-enc ssl-dsa ssl-rsa 
 
-OPENSSL=/usr/sbin/openssl
+OPENSSL=/usr/bin/openssl
 CLEAR1=p
 CIPHER=cipher
 CLEAR2=clear
diff --git a/regress/usr.sbin/openssl/README b/regress/usr.bin/openssl/README
index 878feca400d..878feca400d 100644
--- a/regress/usr.sbin/openssl/README
+++ b/regress/usr.bin/openssl/README
diff --git a/regress/usr.sbin/openssl/openssl.cnf b/regress/usr.bin/openssl/openssl.cnf
index d2e85ad0e2a..8e1eeb7f162 100644
--- a/regress/usr.sbin/openssl/openssl.cnf
+++ b/regress/usr.bin/openssl/openssl.cnf
@@ -1,4 +1,4 @@
-#	$OpenBSD: openssl.cnf,v 1.1 2014/05/24 13:32:46 jsing Exp $
+#	$OpenBSD: openssl.cnf,v 1.1 2014/08/26 17:50:07 jsing Exp $
 
 #
 # SSLeay example configuration file.
diff --git a/regress/usr.sbin/openssl/test_client.sh b/regress/usr.bin/openssl/test_client.sh
index c51f68debfe..36c6ac4adda 100644
--- a/regress/usr.sbin/openssl/test_client.sh
+++ b/regress/usr.bin/openssl/test_client.sh
@@ -1,6 +1,5 @@
 #!/bin/sh
-#	$OpenBSD: test_client.sh,v 1.1 2014/05/24 13:32:46 jsing Exp $
-
+#	$OpenBSD: test_client.sh,v 1.1 2014/08/26 17:50:07 jsing Exp $
 
 echo
 echo This starts a tls1 mode client to talk to the server run by 
@@ -10,4 +9,4 @@ echo type in this window after ssl negotiation and your output should
 echo be echoed by the server. 
 echo
 echo
-/usr/sbin/openssl s_client -tls1
+/usr/bin/openssl s_client -tls1
diff --git a/regress/usr.sbin/openssl/test_server.sh b/regress/usr.bin/openssl/test_server.sh
index cab89455275..b4fd2560dff 100644
--- a/regress/usr.sbin/openssl/test_server.sh
+++ b/regress/usr.bin/openssl/test_server.sh
@@ -1,6 +1,5 @@
 #!/bin/sh
-#	$OpenBSD: test_server.sh,v 1.1 2014/05/24 13:32:46 jsing Exp $
-
+#	$OpenBSD: test_server.sh,v 1.1 2014/08/26 17:50:07 jsing Exp $
 
 echo This starts a tls1 mode server using the DSA certificate in ./server.pem
 echo Run ./testclient.sh in another window and type at it, you should 
@@ -8,4 +7,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/openssl s_server -tls1 -key testdsa.key -cert testdsa.pem
+/usr/bin/openssl s_server -tls1 -key testdsa.key -cert testdsa.pem
diff --git a/regress/usr.sbin/openssl/testdsa.sh b/regress/usr.bin/openssl/testdsa.sh
index b895cb7c728..32293d8ff35 100644
--- a/regress/usr.sbin/openssl/testdsa.sh
+++ b/regress/usr.bin/openssl/testdsa.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-#	$OpenBSD: testdsa.sh,v 1.1 2014/05/24 13:32:46 jsing Exp $
+#	$OpenBSD: testdsa.sh,v 1.1 2014/08/26 17:50:07 jsing Exp $
 
 
 #Test DSA certificate generation of openssl
diff --git a/regress/usr.sbin/openssl/testenc.sh b/regress/usr.bin/openssl/testenc.sh
index 0f73f8e11fe..72c87a87a91 100644
--- a/regress/usr.sbin/openssl/testenc.sh
+++ b/regress/usr.bin/openssl/testenc.sh
@@ -1,10 +1,9 @@
 #!/bin/sh
-#	$OpenBSD: testenc.sh,v 1.1 2014/05/24 13:32:46 jsing Exp $
-
+#	$OpenBSD: testenc.sh,v 1.1 2014/08/26 17:50:07 jsing Exp $
 
 testsrc=$2/openssl.cnf
 test=$1/p
-cmd=/usr/sbin/openssl
+cmd=/usr/bin/openssl
 
 cd $1
 
diff --git a/regress/usr.sbin/openssl/testrsa.sh b/regress/usr.bin/openssl/testrsa.sh
index 4488c311291..a9a00f295e0 100644
--- a/regress/usr.sbin/openssl/testrsa.sh
+++ b/regress/usr.bin/openssl/testrsa.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-#	$OpenBSD: testrsa.sh,v 1.1 2014/05/24 13:32:46 jsing Exp $
+#	$OpenBSD: testrsa.sh,v 1.1 2014/08/26 17:50:07 jsing Exp $
 
 
 #Test RSA certificate generation of openssl
diff --git a/regress/usr.sbin/Makefile b/regress/usr.sbin/Makefile
index 3380bc6f0dc..e53866b5535 100644
--- a/regress/usr.sbin/Makefile
+++ b/regress/usr.sbin/Makefile
@@ -1,7 +1,6 @@
-#	$OpenBSD: Makefile,v 1.8 2014/08/20 20:54:27 bluhm Exp $
+#	$OpenBSD: Makefile,v 1.9 2014/08/26 17:50:07 jsing Exp $
 
 SUBDIR += mtree
-SUBDIR += openssl
 SUBDIR += ospfd
 SUBDIR += relayd
 SUBDIR += syslogd