From cdac03400681d14062d03c58264811f23fedae2a Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Mon, 4 Nov 2019 15:25:54 +0000
Subject: Hook openssl(1) cms back up.

---
 src/usr.bin/openssl/Makefile  | 4 ++--
 src/usr.bin/openssl/openssl.c | 5 ++++-
 src/usr.bin/openssl/progs.h   | 3 ++-
 3 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/usr.bin/openssl/Makefile b/src/usr.bin/openssl/Makefile
index 7efc759ceb..664a520003 100644
--- a/src/usr.bin/openssl/Makefile
+++ b/src/usr.bin/openssl/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.10 2017/08/13 19:42:33 doug Exp $
+#	$OpenBSD: Makefile,v 1.11 2019/11/04 15:25:54 jsing Exp $
 
 .include <bsd.own.mk>
 
@@ -20,7 +20,7 @@ CFLAGS+= -Werror
 .endif
 CFLAGS+= -DLIBRESSL_INTERNAL
 
-SRCS=	apps.c apps_posix.c asn1pars.c ca.c certhash.c ciphers.c crl.c \
+SRCS=	apps.c apps_posix.c asn1pars.c ca.c certhash.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 \
 	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 \
diff --git a/src/usr.bin/openssl/openssl.c b/src/usr.bin/openssl/openssl.c
index dbd15c80a8..42b9b91b7a 100644
--- a/src/usr.bin/openssl/openssl.c
+++ b/src/usr.bin/openssl/openssl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: openssl.c,v 1.29 2019/03/17 17:46:00 tb Exp $ */
+/* $OpenBSD: openssl.c,v 1.30 2019/11/04 15:25:54 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -154,6 +154,9 @@ FUNCTION functions[] = {
 	{ FUNC_TYPE_GENERAL, "ca", ca_main },
 	{ FUNC_TYPE_GENERAL, "certhash", certhash_main },
 	{ FUNC_TYPE_GENERAL, "ciphers", ciphers_main },
+#ifndef OPENSSL_NO_CMS
+	{ FUNC_TYPE_GENERAL, "cms", cms_main },
+#endif
 	{ FUNC_TYPE_GENERAL, "crl2pkcs7", crl2pkcs7_main },
 	{ FUNC_TYPE_GENERAL, "crl", crl_main },
 	{ FUNC_TYPE_GENERAL, "dgst", dgst_main },
diff --git a/src/usr.bin/openssl/progs.h b/src/usr.bin/openssl/progs.h
index 1c11a35655..8ccf8123f4 100644
--- a/src/usr.bin/openssl/progs.h
+++ b/src/usr.bin/openssl/progs.h
@@ -1,10 +1,11 @@
-/* $OpenBSD: progs.h,v 1.8 2016/09/05 10:45:19 deraadt Exp $ */
+/* $OpenBSD: progs.h,v 1.9 2019/11/04 15:25:54 jsing Exp $ */
 /* Public domain */
 
 int asn1parse_main(int argc, char **argv);
 int ca_main(int argc, char **argv);
 int certhash_main(int argc, char **argv);
 int ciphers_main(int argc, char **argv);
+int cms_main(int argc, char **argv);
 int crl2pkcs7_main(int argc, char **argv);
 int crl_main(int argc, char **argv);
 int dgst_main(int argc, char **argv);
-- 
cgit v1.2.3-55-g6feb