diff options
| author |   jsing <jsing@openbsd.org> | 2019-11-04 15:25:54 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2019-11-04 15:25:54 +0000 |
| commit | a9821b6acbdba898f355d5aa96537c421b2f75e6 (patch) | |
| tree | 1e14eabebfc8f8f52c856e5133b60aaa6631c687 | |
| parent | Currently we need to include pem.h before cms.h... (diff) | |
| download | wireguard-openbsd-a9821b6acbdba898f355d5aa96537c421b2f75e6.tar.xz wireguard-openbsd-a9821b6acbdba898f355d5aa96537c421b2f75e6.zip | |
Hook openssl(1) cms back up.
| -rw-r--r-- | usr.bin/openssl/Makefile | 4 | ||||
| -rw-r--r-- | usr.bin/openssl/openssl.c | 5 | ||||
| -rw-r--r-- | usr.bin/openssl/progs.h | 3 |
3 files changed, 8 insertions, 4 deletions
diff --git a/usr.bin/openssl/Makefile b/usr.bin/openssl/Makefile index 7efc759ceb6..664a5200037 100644 --- a/usr.bin/openssl/Makefile +++ b/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/usr.bin/openssl/openssl.c b/usr.bin/openssl/openssl.c index dbd15c80a83..42b9b91b7ac 100644 --- a/usr.bin/openssl/openssl.c +++ b/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/usr.bin/openssl/progs.h b/usr.bin/openssl/progs.h index 1c11a35655f..8ccf8123f43 100644 --- a/usr.bin/openssl/progs.h +++ b/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); |