Move openssl(1) from /usr/sbin/openssl to /usr/bin/openssl, since it is not

a system/superuser binary. At the same time, move the source code from its
current lib/libssl/src/apps location to a more appropriate home under
usr.bin/openssl.

ok deraadt@ miod@

62 files changed, 92 insertions, 96 deletions

diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index 4c909b329cd..8a88143a6aa 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.145 2014/07/11 08:05:41 tedu Exp $
+#	$OpenBSD: Makefile,v 1.146 2014/08/26 17:47:24 jsing Exp $
 
 .include <bsd.own.mk>
 
@@ -16,7 +16,7 @@ SUBDIR= apply arch at aucat audioctl awk banner \
 	m4 mail make man mandoc mesg mg \
 	midiplay mixerctl mkdep mklocale mktemp modstat nc netstat \
 	newsyslog \
-	nfsstat nice nm nl nohup pagesize passwd paste patch pctr \
+	nfsstat nice nm nl nohup openssl pagesize passwd paste patch pctr \
 	pkg-config pkill \
 	pr printenv printf quota radioctl rcs rdist rdistd \
 	readlink renice rev rpcgen rpcinfo rs rup rusers rwall \
diff --git a/usr.bin/openssl/Makefile b/usr.bin/openssl/Makefile
new file mode 100644
index 00000000000..f4c9ed4f2b2
--- /dev/null
+++ b/usr.bin/openssl/Makefile
@@ -0,0 +1,27 @@
+#	$OpenBSD: Makefile,v 1.1 2014/08/26 17:47:24 jsing Exp $
+
+PROG=	openssl
+LDADD=	-lssl -lcrypto
+DPADD=	${LIBSSL} ${LIBCRYPTO}
+MAN1=	openssl.1
+
+CFLAGS+= -Wall -Werror
+CFLAGS+= -Wformat
+CFLAGS+= -Wformat-security
+CFLAGS+= -Wimplicit
+CFLAGS+= -Wreturn-type
+#CFLAGS+= -Wshadow
+CFLAGS+= -Wtrigraphs
+CFLAGS+= -Wuninitialized
+CFLAGS+= -Wunused
+
+CFLAGS+= -DLIBRESSL_INTERNAL
+
+SRCS=	apps.c asn1pars.c ca.c ciphers.c cms.c crl.c crl2p7.c dgst.c dh.c \
+	dhparam.c dsa.c dsaparam.c ec.c ecparam.c enc.c engine.c errstr.c \
+	gendh.c gendsa.c genpkey.c genrsa.c nseq.c ocsp.c openssl.c passwd.c \
+	pkcs12.c pkcs7.c pkcs8.c pkey.c pkeyparam.c pkeyutl.c prime.c rand.c \
+	req.c rsa.c rsautl.c s_cb.c s_client.c s_server.c s_socket.c s_time.c \
+	sess_id.c smime.c speed.c spkac.c ts.c verify.c version.c x509.c
+
+.include <bsd.prog.mk>
diff --git a/lib/libssl/src/apps/apps.c b/usr.bin/openssl/apps.c
index 7e7086a1c71..ac1c5107f11 100644
--- a/lib/libssl/src/apps/apps.c
+++ b/usr.bin/openssl/apps.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: apps.c,v 1.69 2014/07/25 06:05:31 doug Exp $ */
+/* $OpenBSD: apps.c,v 1.1 2014/08/26 17:47:24 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
diff --git a/lib/libssl/src/apps/apps.h b/usr.bin/openssl/apps.h
index 9d8725159b3..38c5f4be8c8 100644
--- a/lib/libssl/src/apps/apps.h
+++ b/usr.bin/openssl/apps.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: apps.h,v 1.35 2014/07/11 09:24:44 beck Exp $ */
+/* $OpenBSD: apps.h,v 1.1 2014/08/26 17:47:24 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
diff --git a/lib/libssl/src/apps/asn1pars.c b/usr.bin/openssl/asn1pars.c
index 6df27cd6d03..6ba43afb974 100644
--- a/lib/libssl/src/apps/asn1pars.c
+++ b/usr.bin/openssl/asn1pars.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: asn1pars.c,v 1.27 2014/07/14 00:35:10 deraadt Exp $ */
+/* $OpenBSD: asn1pars.c,v 1.1 2014/08/26 17:47:24 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
diff --git a/lib/libssl/src/apps/ca.c b/usr.bin/openssl/ca.c
index ccb32bca19d..c19ecc6616d 100644
--- a/lib/libssl/src/apps/ca.c
+++ b/usr.bin/openssl/ca.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ca.c,v 1.65 2014/07/29 08:51:49 blambert Exp $ */
+/* $OpenBSD: ca.c,v 1.1 2014/08/26 17:47:24 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
diff --git a/lib/libssl/src/apps/ciphers.c b/usr.bin/openssl/ciphers.c
index 7eddf2faba5..bf17f71c065 100644
--- a/lib/libssl/src/apps/ciphers.c
+++ b/usr.bin/openssl/ciphers.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ciphers.c,v 1.27 2014/08/24 14:55:23 jsing Exp $ */
+/* $OpenBSD: ciphers.c,v 1.1 2014/08/26 17:47:24 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
diff --git a/lib/libssl/src/apps/cms.c b/usr.bin/openssl/cms.c
index 91203bc7198..21d27adad1d 100644
--- a/lib/libssl/src/apps/cms.c
+++ b/usr.bin/openssl/cms.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cms.c,v 1.20 2014/07/13 16:03:09 beck Exp $ */
+/* $OpenBSD: cms.c,v 1.1 2014/08/26 17:47:24 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project.
  */
diff --git a/lib/libssl/src/apps/crl.c b/usr.bin/openssl/crl.c
index 57c87b67b76..04de5a2f122 100644
--- a/lib/libssl/src/apps/crl.c
+++ b/usr.bin/openssl/crl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: crl.c,v 1.25 2014/07/14 00:35:10 deraadt Exp $ */
+/* $OpenBSD: crl.c,v 1.1 2014/08/26 17:47:24 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
diff --git a/lib/libssl/src/apps/crl2p7.c b/usr.bin/openssl/crl2p7.c
index de638a7ce25..7fdb6ccfd47 100644
--- a/lib/libssl/src/apps/crl2p7.c
+++ b/usr.bin/openssl/crl2p7.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: crl2p7.c,v 1.20 2014/07/14 00:35:10 deraadt Exp $ */
+/* $OpenBSD: crl2p7.c,v 1.1 2014/08/26 17:47:24 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
diff --git a/lib/libssl/src/apps/dgst.c b/usr.bin/openssl/dgst.c
index e19b9590776..ab64af91928 100644
--- a/lib/libssl/src/apps/dgst.c
+++ b/usr.bin/openssl/dgst.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dgst.c,v 1.39 2014/07/14 00:35:10 deraadt Exp $ */
+/* $OpenBSD: dgst.c,v 1.1 2014/08/26 17:47:24 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
diff --git a/lib/libssl/src/apps/dh.c b/usr.bin/openssl/dh.c
index ce000820f0b..447b4c800fd 100644
--- a/lib/libssl/src/apps/dh.c
+++ b/usr.bin/openssl/dh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dh.c,v 1.26 2014/07/25 06:05:31 doug Exp $ */
+/* $OpenBSD: dh.c,v 1.1 2014/08/26 17:47:24 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
diff --git a/lib/libssl/src/apps/dhparam.c b/usr.bin/openssl/dhparam.c
index 1c41ff6e1b6..0022f726701 100644
--- a/lib/libssl/src/apps/dhparam.c
+++ b/usr.bin/openssl/dhparam.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dhparam.c,v 1.34 2014/07/25 06:05:31 doug Exp $ */
+/* $OpenBSD: dhparam.c,v 1.1 2014/08/26 17:47:24 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
diff --git a/lib/libssl/src/apps/dsa.c b/usr.bin/openssl/dsa.c
index 2b90d4fb1ae..b8ca7dd2ef2 100644
--- a/lib/libssl/src/apps/dsa.c
+++ b/usr.bin/openssl/dsa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dsa.c,v 1.29 2014/07/25 06:05:31 doug Exp $ */
+/* $OpenBSD: dsa.c,v 1.1 2014/08/26 17:47:24 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
diff --git a/lib/libssl/src/apps/dsaparam.c b/usr.bin/openssl/dsaparam.c
index 46f41a57fba..5c17a2c9ac2 100644
--- a/lib/libssl/src/apps/dsaparam.c
+++ b/usr.bin/openssl/dsaparam.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dsaparam.c,v 1.35 2014/07/25 06:05:31 doug Exp $ */
+/* $OpenBSD: dsaparam.c,v 1.1 2014/08/26 17:47:24 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
diff --git a/lib/libssl/src/apps/ec.c b/usr.bin/openssl/ec.c
index 82a98dd21f6..f1bdf55e334 100644
--- a/lib/libssl/src/apps/ec.c
+++ b/usr.bin/openssl/ec.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ec.c,v 1.17 2014/07/25 06:05:32 doug Exp $ */
+/* $OpenBSD: ec.c,v 1.1 2014/08/26 17:47:24 jsing Exp $ */
 /*
  * Written by Nils Larsch for the OpenSSL project.
  */
diff --git a/lib/libssl/src/apps/ecparam.c b/usr.bin/openssl/ecparam.c
index 9f7c287d9cb..9623cb96ce1 100644
--- a/lib/libssl/src/apps/ecparam.c
+++ b/usr.bin/openssl/ecparam.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ecparam.c,v 1.24 2014/07/25 06:05:32 doug Exp $ */
+/* $OpenBSD: ecparam.c,v 1.1 2014/08/26 17:47:24 jsing Exp $ */
 /*
  * Written by Nils Larsch for the OpenSSL project.
  */
diff --git a/lib/libssl/src/apps/enc.c b/usr.bin/openssl/enc.c
index d1943bfa229..eff49818f9a 100644
--- a/lib/libssl/src/apps/enc.c
+++ b/usr.bin/openssl/enc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: enc.c,v 1.39 2014/07/25 06:05:32 doug Exp $ */
+/* $OpenBSD: enc.c,v 1.1 2014/08/26 17:47:24 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
diff --git a/lib/libssl/src/apps/engine.c b/usr.bin/openssl/engine.c
index 4b33ee45cea..2d24e07254b 100644
--- a/lib/libssl/src/apps/engine.c
+++ b/usr.bin/openssl/engine.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: engine.c,v 1.27 2014/07/14 00:35:10 deraadt Exp $ */
+/* $OpenBSD: engine.c,v 1.1 2014/08/26 17:47:24 jsing Exp $ */
 /* Written by Richard Levitte <richard@levitte.org> for the OpenSSL
  * project 2000.
  */
diff --git a/lib/libssl/src/apps/errstr.c b/usr.bin/openssl/errstr.c
index 2f4087d1228..163da2e5b37 100644
--- a/lib/libssl/src/apps/errstr.c
+++ b/usr.bin/openssl/errstr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: errstr.c,v 1.19 2014/07/14 00:35:10 deraadt Exp $ */
+/* $OpenBSD: errstr.c,v 1.1 2014/08/26 17:47:24 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
diff --git a/lib/libssl/src/apps/gendh.c b/usr.bin/openssl/gendh.c
index 2cce6cf50b7..06d62c1b0d3 100644
--- a/lib/libssl/src/apps/gendh.c
+++ b/usr.bin/openssl/gendh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gendh.c,v 1.28 2014/07/14 00:35:10 deraadt Exp $ */
+/* $OpenBSD: gendh.c,v 1.1 2014/08/26 17:47:24 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
diff --git a/lib/libssl/src/apps/gendsa.c b/usr.bin/openssl/gendsa.c
index d45e237103c..7c9f568830c 100644
--- a/lib/libssl/src/apps/gendsa.c
+++ b/usr.bin/openssl/gendsa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gendsa.c,v 1.31 2014/07/25 06:05:32 doug Exp $ */
+/* $OpenBSD: gendsa.c,v 1.1 2014/08/26 17:47:24 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
diff --git a/lib/libssl/src/apps/genpkey.c b/usr.bin/openssl/genpkey.c
index 23e32e49f04..02332f66825 100644
--- a/lib/libssl/src/apps/genpkey.c
+++ b/usr.bin/openssl/genpkey.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: genpkey.c,v 1.13 2014/07/14 00:35:10 deraadt Exp $ */
+/* $OpenBSD: genpkey.c,v 1.1 2014/08/26 17:47:24 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2006
  */
diff --git a/lib/libssl/src/apps/genrsa.c b/usr.bin/openssl/genrsa.c
index 9115a0b3a8a..7844fb815fb 100644
--- a/lib/libssl/src/apps/genrsa.c
+++ b/usr.bin/openssl/genrsa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: genrsa.c,v 1.37 2014/07/14 00:35:10 deraadt Exp $ */
+/* $OpenBSD: genrsa.c,v 1.1 2014/08/26 17:47:24 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
diff --git a/lib/libssl/src/apps/nseq.c b/usr.bin/openssl/nseq.c
index 154b6a5685b..6c32f7c4b4c 100644
--- a/lib/libssl/src/apps/nseq.c
+++ b/usr.bin/openssl/nseq.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nseq.c,v 1.16 2014/07/14 00:35:10 deraadt Exp $ */
+/* $OpenBSD: nseq.c,v 1.1 2014/08/26 17:47:24 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
diff --git a/lib/libssl/src/apps/ocsp.c b/usr.bin/openssl/ocsp.c
index b28f160d9a3..bdc224d8bc1 100644
--- a/lib/libssl/src/apps/ocsp.c
+++ b/usr.bin/openssl/ocsp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ocsp.c,v 1.31 2014/08/24 16:07:29 bcook Exp $ */
+/* $OpenBSD: ocsp.c,v 1.1 2014/08/26 17:47:24 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2000.
  */
diff --git a/usr.sbin/openssl/openssl.1 b/usr.bin/openssl/openssl.1
index f5594069fca..b374728ba9e 100644
--- a/usr.sbin/openssl/openssl.1
+++ b/usr.bin/openssl/openssl.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: openssl.1,v 1.99 2014/07/22 06:47:13 guenther Exp $
+.\" $OpenBSD: openssl.1,v 1.1 2014/08/26 17:47:24 jsing Exp $
 .\" ====================================================================
 .\" Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
 .\"
@@ -112,7 +112,7 @@
 .\"
 .\" OPENSSL
 .\"
-.Dd $Mdocdate: July 22 2014 $
+.Dd $Mdocdate: August 26 2014 $
 .Dt OPENSSL 1
 .Os
 .Sh NAME
diff --git a/lib/libssl/src/apps/openssl.c b/usr.bin/openssl/openssl.c
index 3852f937f68..bcb9b56b744 100644
--- a/lib/libssl/src/apps/openssl.c
+++ b/usr.bin/openssl/openssl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: openssl.c,v 1.43 2014/07/18 18:01:26 deraadt Exp $ */
+/* $OpenBSD: openssl.c,v 1.1 2014/08/26 17:47:25 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
diff --git a/lib/libssl/src/apps/passwd.c b/usr.bin/openssl/passwd.c
index 6a16a475a96..fd5d062f57d 100644
--- a/lib/libssl/src/apps/passwd.c
+++ b/usr.bin/openssl/passwd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: passwd.c,v 1.24 2014/07/25 06:05:32 doug Exp $ */
+/* $OpenBSD: passwd.c,v 1.1 2014/08/26 17:47:25 jsing Exp $ */
 
 #if defined OPENSSL_NO_MD5
 #define NO_MD5CRYPT_1
diff --git a/lib/libssl/src/apps/pkcs12.c b/usr.bin/openssl/pkcs12.c
index 9899fa6950d..77b7c31d016 100644
--- a/lib/libssl/src/apps/pkcs12.c
+++ b/usr.bin/openssl/pkcs12.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pkcs12.c,v 1.38 2014/07/14 00:35:10 deraadt Exp $ */
+/* $OpenBSD: pkcs12.c,v 1.1 2014/08/26 17:47:25 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project.
  */
diff --git a/lib/libssl/src/apps/pkcs7.c b/usr.bin/openssl/pkcs7.c
index 34b9d512c4a..2c2af168a95 100644
--- a/lib/libssl/src/apps/pkcs7.c
+++ b/usr.bin/openssl/pkcs7.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pkcs7.c,v 1.21 2014/07/14 00:35:10 deraadt Exp $ */
+/* $OpenBSD: pkcs7.c,v 1.1 2014/08/26 17:47:25 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
diff --git a/lib/libssl/src/apps/pkcs8.c b/usr.bin/openssl/pkcs8.c
index 9b0b15baac6..1715fe1d6b6 100644
--- a/lib/libssl/src/apps/pkcs8.c
+++ b/usr.bin/openssl/pkcs8.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pkcs8.c,v 1.21 2014/07/14 00:35:10 deraadt Exp $ */
+/* $OpenBSD: pkcs8.c,v 1.1 2014/08/26 17:47:25 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999-2004.
  */
diff --git a/lib/libssl/src/apps/pkey.c b/usr.bin/openssl/pkey.c
index a419e3007f9..7f13bbbf620 100644
--- a/lib/libssl/src/apps/pkey.c
+++ b/usr.bin/openssl/pkey.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pkey.c,v 1.11 2014/07/14 00:35:10 deraadt Exp $ */
+/* $OpenBSD: pkey.c,v 1.1 2014/08/26 17:47:25 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2006
  */
diff --git a/lib/libssl/src/apps/pkeyparam.c b/usr.bin/openssl/pkeyparam.c
index 3ae73efb681..c48f1a95ddf 100644
--- a/lib/libssl/src/apps/pkeyparam.c
+++ b/usr.bin/openssl/pkeyparam.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pkeyparam.c,v 1.9 2014/07/14 00:35:10 deraadt Exp $ */
+/* $OpenBSD: pkeyparam.c,v 1.1 2014/08/26 17:47:25 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2006
  */
diff --git a/lib/libssl/src/apps/pkeyutl.c b/usr.bin/openssl/pkeyutl.c
index df173f4374f..5fff008db62 100644
--- a/lib/libssl/src/apps/pkeyutl.c
+++ b/usr.bin/openssl/pkeyutl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pkeyutl.c,v 1.14 2014/07/14 00:35:10 deraadt Exp $ */
+/* $OpenBSD: pkeyutl.c,v 1.1 2014/08/26 17:47:25 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2006.
  */
diff --git a/lib/libssl/src/apps/prime.c b/usr.bin/openssl/prime.c
index 710939f08da..e7fb3257d8f 100644
--- a/lib/libssl/src/apps/prime.c
+++ b/usr.bin/openssl/prime.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: prime.c,v 1.12 2014/07/14 00:35:10 deraadt Exp $ */
+/* $OpenBSD: prime.c,v 1.1 2014/08/26 17:47:25 jsing Exp $ */
 /* ====================================================================
  * Copyright (c) 2004 The OpenSSL Project.  All rights reserved.
  *
diff --git a/lib/libssl/src/apps/progs.h b/usr.bin/openssl/progs.h
index c1a0898a461..6f957c6f7c9 100644
--- a/lib/libssl/src/apps/progs.h
+++ b/usr.bin/openssl/progs.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: progs.h,v 1.22 2014/07/28 17:57:18 tedu Exp $ */
+/* $OpenBSD: progs.h,v 1.1 2014/08/26 17:47:25 jsing Exp $ */
 /* Public domain */
 
 extern int asn1parse_main(int argc, char *argv[]);
diff --git a/lib/libssl/src/apps/rand.c b/usr.bin/openssl/rand.c
index 9d7aba4d86b..0800157a35d 100644
--- a/lib/libssl/src/apps/rand.c
+++ b/usr.bin/openssl/rand.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rand.c,v 1.22 2014/07/14 00:35:10 deraadt Exp $ */
+/* $OpenBSD: rand.c,v 1.1 2014/08/26 17:47:25 jsing Exp $ */
 /* ====================================================================
  * Copyright (c) 1998-2001 The OpenSSL Project.  All rights reserved.
  *
diff --git a/lib/libssl/src/apps/req.c b/usr.bin/openssl/req.c
index 7c2ce58f88b..87599b35e14 100644
--- a/lib/libssl/src/apps/req.c
+++ b/usr.bin/openssl/req.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: req.c,v 1.46 2014/07/14 00:35:10 deraadt Exp $ */
+/* $OpenBSD: req.c,v 1.1 2014/08/26 17:47:25 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
diff --git a/lib/libssl/src/apps/rsa.c b/usr.bin/openssl/rsa.c
index 1bb78e94a9a..677e35f8592 100644
--- a/lib/libssl/src/apps/rsa.c
+++ b/usr.bin/openssl/rsa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rsa.c,v 1.27 2014/07/14 00:35:10 deraadt Exp $ */
+/* $OpenBSD: rsa.c,v 1.1 2014/08/26 17:47:25 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
diff --git a/lib/libssl/src/apps/rsautl.c b/usr.bin/openssl/rsautl.c
index d961582fe4e..7c83f1a82c1 100644
--- a/lib/libssl/src/apps/rsautl.c
+++ b/usr.bin/openssl/rsautl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rsautl.c,v 1.24 2014/07/14 00:35:10 deraadt Exp $ */
+/* $OpenBSD: rsautl.c,v 1.1 2014/08/26 17:47:25 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2000.
  */
diff --git a/lib/libssl/src/apps/s_apps.h b/usr.bin/openssl/s_apps.h
index e81350ea561..dd4b733afb2 100644
--- a/lib/libssl/src/apps/s_apps.h
+++ b/usr.bin/openssl/s_apps.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: s_apps.h,v 1.14 2014/06/12 15:49:27 deraadt Exp $ */
+/* $OpenBSD: s_apps.h,v 1.1 2014/08/26 17:47:25 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
diff --git a/lib/libssl/src/apps/s_cb.c b/usr.bin/openssl/s_cb.c
index 29dd80e87de..2e00abe7f15 100644
--- a/lib/libssl/src/apps/s_cb.c
+++ b/usr.bin/openssl/s_cb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s_cb.c,v 1.22 2014/06/13 04:29:13 miod Exp $ */
+/* $OpenBSD: s_cb.c,v 1.1 2014/08/26 17:47:25 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
diff --git a/lib/libssl/src/apps/s_client.c b/usr.bin/openssl/s_client.c
index 9cc764660cb..f35624bacac 100644
--- a/lib/libssl/src/apps/s_client.c
+++ b/usr.bin/openssl/s_client.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s_client.c,v 1.70 2014/08/24 16:07:29 bcook Exp $ */
+/* $OpenBSD: s_client.c,v 1.1 2014/08/26 17:47:25 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
diff --git a/lib/libssl/src/apps/s_server.c b/usr.bin/openssl/s_server.c
index c986ebcb3e9..7fa875c661c 100644
--- a/lib/libssl/src/apps/s_server.c
+++ b/usr.bin/openssl/s_server.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s_server.c,v 1.63 2014/08/24 16:07:29 bcook Exp $ */
+/* $OpenBSD: s_server.c,v 1.1 2014/08/26 17:47:25 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
diff --git a/lib/libssl/src/apps/s_socket.c b/usr.bin/openssl/s_socket.c
index c5f3a285198..48af178a231 100644
--- a/lib/libssl/src/apps/s_socket.c
+++ b/usr.bin/openssl/s_socket.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s_socket.c,v 1.42 2014/06/28 04:39:41 deraadt Exp $ */
+/* $OpenBSD: s_socket.c,v 1.1 2014/08/26 17:47:25 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
diff --git a/lib/libssl/src/apps/s_time.c b/usr.bin/openssl/s_time.c
index ae1aa000197..f8c104b7d7d 100644
--- a/lib/libssl/src/apps/s_time.c
+++ b/usr.bin/openssl/s_time.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s_time.c,v 1.35 2014/08/24 16:07:29 bcook Exp $ */
+/* $OpenBSD: s_time.c,v 1.1 2014/08/26 17:47:25 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
diff --git a/lib/libssl/src/apps/sess_id.c b/usr.bin/openssl/sess_id.c
index 0022abc4368..23df0301b36 100644
--- a/lib/libssl/src/apps/sess_id.c
+++ b/usr.bin/openssl/sess_id.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sess_id.c,v 1.20 2014/07/25 06:05:32 doug Exp $ */
+/* $OpenBSD: sess_id.c,v 1.1 2014/08/26 17:47:25 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
diff --git a/lib/libssl/src/apps/smime.c b/usr.bin/openssl/smime.c
index 8386f1e458c..155bb8b03d8 100644
--- a/lib/libssl/src/apps/smime.c
+++ b/usr.bin/openssl/smime.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: smime.c,v 1.28 2014/07/14 00:35:10 deraadt Exp $ */
+/* $OpenBSD: smime.c,v 1.1 2014/08/26 17:47:25 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project.
  */
diff --git a/lib/libssl/src/apps/speed.c b/usr.bin/openssl/speed.c
index 61b2157c28c..82a0f90f054 100644
--- a/lib/libssl/src/apps/speed.c
+++ b/usr.bin/openssl/speed.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: speed.c,v 1.52 2014/07/14 00:35:10 deraadt Exp $ */
+/* $OpenBSD: speed.c,v 1.1 2014/08/26 17:47:25 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
diff --git a/lib/libssl/src/apps/spkac.c b/usr.bin/openssl/spkac.c
index b13a83d0970..266ed576622 100644
--- a/lib/libssl/src/apps/spkac.c
+++ b/usr.bin/openssl/spkac.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: spkac.c,v 1.22 2014/07/22 06:55:22 guenther Exp $ */
+/* $OpenBSD: spkac.c,v 1.1 2014/08/26 17:47:25 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999. Based on an original idea by Massimiliano Pala
  * (madwolf@openca.org).
diff --git a/lib/libssl/src/apps/testdsa.h b/usr.bin/openssl/testdsa.h
index 0fcdac0f36d..1bbb09ca708 100644
--- a/lib/libssl/src/apps/testdsa.h
+++ b/usr.bin/openssl/testdsa.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: testdsa.h,v 1.7 2014/06/12 15:49:27 deraadt Exp $ */
+/* $OpenBSD: testdsa.h,v 1.1 2014/08/26 17:47:25 jsing Exp $ */
 
 DSA *get_dsa512(void);
 DSA *get_dsa1024(void);
diff --git a/lib/libssl/src/apps/testrsa.h b/usr.bin/openssl/testrsa.h
index 66e13281f70..789afa9621e 100644
--- a/lib/libssl/src/apps/testrsa.h
+++ b/usr.bin/openssl/testrsa.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: testrsa.h,v 1.4 2014/06/12 15:49:27 deraadt Exp $ */
+/* $OpenBSD: testrsa.h,v 1.1 2014/08/26 17:47:25 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
diff --git a/lib/libssl/src/apps/timeouts.h b/usr.bin/openssl/timeouts.h
index 2b3ae38bb4d..dd2f85028d9 100644
--- a/lib/libssl/src/apps/timeouts.h
+++ b/usr.bin/openssl/timeouts.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: timeouts.h,v 1.3 2014/06/12 15:49:27 deraadt Exp $ */
+/* $OpenBSD: timeouts.h,v 1.1 2014/08/26 17:47:25 jsing Exp $ */
 /*
  * DTLS implementation written by Nagendra Modadugu
  * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.
diff --git a/lib/libssl/src/apps/ts.c b/usr.bin/openssl/ts.c
index 91422428606..fab79b9ceeb 100644
--- a/lib/libssl/src/apps/ts.c
+++ b/usr.bin/openssl/ts.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ts.c,v 1.18 2014/07/12 17:54:31 jsing Exp $ */
+/* $OpenBSD: ts.c,v 1.1 2014/08/26 17:47:25 jsing Exp $ */
 /* Written by Zoltan Glozik (zglozik@stones.com) for the OpenSSL
  * project 2002.
  */
diff --git a/lib/libssl/src/apps/verify.c b/usr.bin/openssl/verify.c
index 218270aa441..057c4673723 100644
--- a/lib/libssl/src/apps/verify.c
+++ b/usr.bin/openssl/verify.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: verify.c,v 1.26 2014/07/14 00:35:10 deraadt Exp $ */
+/* $OpenBSD: verify.c,v 1.1 2014/08/26 17:47:25 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
diff --git a/lib/libssl/src/apps/version.c b/usr.bin/openssl/version.c
index 4bb0ef558ca..afad0c3e112 100644
--- a/lib/libssl/src/apps/version.c
+++ b/usr.bin/openssl/version.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: version.c,v 1.18 2014/07/14 00:35:10 deraadt Exp $ */
+/* $OpenBSD: version.c,v 1.1 2014/08/26 17:47:25 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
diff --git a/lib/libssl/src/apps/x509.c b/usr.bin/openssl/x509.c
index 6729ed412ce..afbccc00d6f 100644
--- a/lib/libssl/src/apps/x509.c
+++ b/usr.bin/openssl/x509.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: x509.c,v 1.49 2014/07/14 00:35:10 deraadt Exp $ */
+/* $OpenBSD: x509.c,v 1.1 2014/08/26 17:47:25 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
index e6c718adf34..7498c26426f 100644
--- a/usr.sbin/Makefile
+++ b/usr.sbin/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.180 2014/08/22 05:47:08 ajacoutot Exp $
+#	$OpenBSD: Makefile,v 1.181 2014/08/26 17:47:24 jsing Exp $
 
 .include <bsd.own.mk>
 
@@ -10,7 +10,7 @@ SUBDIR=	ac accton acpidump adduser amd apm apmd arp \
 	ldapd ldapctl ldomctl ldomd ldpd ldpctl lpr mailwrapper map-mbone \
 	memconfig mksuncd mkuboot mopd mrinfo mrouted \
 	mtrace mtree ndp netgroup_mkdb \
-	nginx npppctl npppd nsd ntpd openssl ospfctl ospfd ospf6d ospf6ctl \
+	nginx npppctl npppd nsd ntpd ospfctl ospfd ospf6d ospf6ctl \
 	pcidump pkg_add portmap pppd procmap pstat pwd_mkdb \
 	quot quotaon rarpd rbootd rcctl rdate relayctl relayd repquota rip6query \
 	ripctl ripd rmt route6d rpc.bootparamd rpc.lockd rpc.statd rtadvd \
diff --git a/usr.sbin/ikectl/ikeca.c b/usr.sbin/ikectl/ikeca.c
index cb19ba94ec3..dd18a208443 100644
--- a/usr.sbin/ikectl/ikeca.c
+++ b/usr.sbin/ikectl/ikeca.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ikeca.c,v 1.28 2014/08/25 07:50:26 doug Exp $	*/
+/*	$OpenBSD: ikeca.c,v 1.29 2014/08/26 17:47:24 jsing Exp $	*/
 
 /*
  * Copyright (c) 2010 Jonathan Gray <jsg@openbsd.org>
@@ -52,7 +52,7 @@
 #endif
 
 #ifndef PATH_OPENSSL
-#define PATH_OPENSSL	"/usr/sbin/openssl"
+#define PATH_OPENSSL	"/usr/bin/openssl"
 #endif
 #ifndef PATH_ZIP
 #define PATH_ZIP	"/usr/local/bin/zip"
diff --git a/usr.sbin/openssl/Makefile b/usr.sbin/openssl/Makefile
deleted file mode 100644
index 1d149f25d8b..00000000000
--- a/usr.sbin/openssl/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-#	$OpenBSD: Makefile,v 1.31 2014/07/27 23:46:51 guenther Exp $
-
-PROG=	openssl
-LDADD=	-lssl -lcrypto
-DPADD=	${LIBSSL} ${LIBCRYPTO}
-MAN1=	openssl.1
-
-CFLAGS+= -Wall -Werror
-CFLAGS+= -Wformat
-CFLAGS+= -Wformat-security
-CFLAGS+= -Wimplicit
-CFLAGS+= -Wreturn-type
-#CFLAGS+= -Wshadow
-CFLAGS+= -Wtrigraphs
-CFLAGS+= -Wuninitialized
-CFLAGS+= -Wunused
-
-CFLAGS+= -DLIBRESSL_INTERNAL
-
-SRCS=	verify.c asn1pars.c req.c dgst.c dh.c enc.c passwd.c gendh.c errstr.c \
-	pkcs7.c crl2p7.c crl.c ca.c \
-	rsa.c rsautl.c dsa.c dsaparam.c ec.c ecparam.c \
-	x509.c genrsa.c gendsa.c genpkey.c s_server.c s_client.c speed.c \
-	s_time.c apps.c s_socket.c version.c sess_id.c \
-	ciphers.c nseq.c pkcs12.c pkcs8.c pkey.c pkeyparam.c pkeyutl.c \
-	spkac.c smime.c cms.c rand.c engine.c ocsp.c prime.c ts.c \
-	openssl.c s_cb.c dhparam.c
-
-.PATH:	${.CURDIR}/../../lib/libssl/src/apps
-
-.include <bsd.prog.mk>
diff --git a/usr.sbin/pkg_add/OpenBSD/Paths.pm b/usr.sbin/pkg_add/OpenBSD/Paths.pm
index 3f44257f21d..1530f8edc0c 100644
--- a/usr.sbin/pkg_add/OpenBSD/Paths.pm
+++ b/usr.sbin/pkg_add/OpenBSD/Paths.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: Paths.pm,v 1.29 2014/07/14 08:47:49 espie Exp $
+# $OpenBSD: Paths.pm,v 1.30 2014/08/26 17:47:24 jsing Exp $
 #
 # Copyright (c) 2007-2014 Marc Espie <espie@openbsd.org>
 #
@@ -30,7 +30,7 @@ sub install_info() { '/usr/bin/install-info' }
 sub useradd() { '/usr/sbin/useradd' }
 sub groupadd() { '/usr/sbin/groupadd' }
 sub sysctl() { '/sbin/sysctl' }
-sub openssl() { '/usr/sbin/openssl' }
+sub openssl() { '/usr/bin/openssl' }
 sub pkgca() { '/etc/ssl/pkgca.pem' }
 sub signify() { '/usr/bin/signify' }
 sub signifykey { my $s = $_[1]; "/etc/signify/$s.pub" }