Tweak cross references, in particular making sure that

all CMS pages are linked to CMS_ContentInfo_new(3) both ways
and that closely related pages reference each other.

23 files changed, 85 insertions, 48 deletions

diff --git a/src/lib/libcrypto/man/BIO_new_CMS.3 b/src/lib/libcrypto/man/BIO_new_CMS.3
index 5b18ed1580..1298f9bbe5 100644
--- a/src/lib/libcrypto/man/BIO_new_CMS.3
+++ b/src/lib/libcrypto/man/BIO_new_CMS.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: BIO_new_CMS.3,v 1.5 2019/08/11 12:46:38 schwarze Exp $
+.\" $OpenBSD: BIO_new_CMS.3,v 1.6 2019/08/18 21:44:10 schwarze Exp $
 .\" full merge up to: OpenSSL df75c2bfc Dec 9 01:02:36 2018 +0100
 .\"
 .\" This file was written by Dr. Stephen Henson <steve@openssl.org>.
@@ -48,7 +48,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: August 11 2019 $
+.Dd $Mdocdate: August 18 2019 $
 .Dt BIO_NEW_CMS 3
 .Os
 .Sh NAME
@@ -127,6 +127,8 @@ if an error occurred.
 The error can be obtained from
 .Xr ERR_get_error 3 .
 .Sh SEE ALSO
+.Xr BIO_new 3 ,
+.Xr CMS_ContentInfo_new 3 ,
 .Xr CMS_encrypt 3 ,
 .Xr CMS_sign 3
 .Sh HISTORY
diff --git a/src/lib/libcrypto/man/CMS_ContentInfo_new.3 b/src/lib/libcrypto/man/CMS_ContentInfo_new.3
index 71597e3467..38a29da11b 100644
--- a/src/lib/libcrypto/man/CMS_ContentInfo_new.3
+++ b/src/lib/libcrypto/man/CMS_ContentInfo_new.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: CMS_ContentInfo_new.3,v 1.1 2019/08/12 14:24:38 schwarze Exp $
+.\" $OpenBSD: CMS_ContentInfo_new.3,v 1.2 2019/08/18 21:44:10 schwarze Exp $
 .\" Copyright (c) 2019 Ingo Schwarze <schwarze@openbsd.org>
 .\"
 .\" Permission to use, copy, modify, and distribute this software for any
@@ -13,7 +13,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: August 12 2019 $
+.Dd $Mdocdate: August 18 2019 $
 .Dt CMS_CONTENTINFO_NEW 3
 .Os
 .Sh NAME
@@ -107,6 +107,7 @@ if an error occurs.
 .Xr CMS_uncompress 3 ,
 .Xr CMS_verify 3 ,
 .Xr CMS_verify_receipt 3 ,
+.Xr crypto 3 ,
 .Xr d2i_CMS_ContentInfo 3 ,
 .Xr i2d_CMS_bio_stream 3 ,
 .Xr PEM_read_bio_PrivateKey 3 ,
@@ -116,6 +117,8 @@ if an error occurs.
 .Sh STANDARDS
 RFC 5652: Cryptographic Message Syntax, section 3: General Syntax
 .Pp
+RFC 3274: Compressed Data Content Type for Cryptographic Message Syntax (CMS)
+.Pp
 RFC 2634: Enhanced Security Services for S/MIME,
 section 2.7: Receipt Request Syntax
 .Sh HISTORY
diff --git a/src/lib/libcrypto/man/CMS_add0_cert.3 b/src/lib/libcrypto/man/CMS_add0_cert.3
index 6f87fcb142..1cc936283b 100644
--- a/src/lib/libcrypto/man/CMS_add0_cert.3
+++ b/src/lib/libcrypto/man/CMS_add0_cert.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: CMS_add0_cert.3,v 1.5 2019/08/12 21:29:43 schwarze Exp $
+.\" $OpenBSD: CMS_add0_cert.3,v 1.6 2019/08/18 21:44:10 schwarze Exp $
 .\" full merge up to: OpenSSL e9b77246 Jan 20 19:58:49 2017 +0100
 .\"
 .\" This file is a derived work.
@@ -65,7 +65,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: August 12 2019 $
+.Dd $Mdocdate: August 18 2019 $
 .Dt CMS_ADD0_CERT 3
 .Os
 .Sh NAME
@@ -187,7 +187,9 @@ The only error which will occur in practice is if the
 .Fa cms
 type is invalid.
 .Sh SEE ALSO
+.Xr CMS_ContentInfo_new 3 ,
 .Xr CMS_encrypt 3 ,
+.Xr CMS_final 3 ,
 .Xr CMS_sign 3 ,
 .Xr ERR_get_error 3
 .Sh STANDARDS
diff --git a/src/lib/libcrypto/man/CMS_add1_recipient_cert.3 b/src/lib/libcrypto/man/CMS_add1_recipient_cert.3
index 4ba15c41c0..0bfb6ac829 100644
--- a/src/lib/libcrypto/man/CMS_add1_recipient_cert.3
+++ b/src/lib/libcrypto/man/CMS_add1_recipient_cert.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: CMS_add1_recipient_cert.3,v 1.5 2019/08/13 23:54:16 schwarze Exp $
+.\" $OpenBSD: CMS_add1_recipient_cert.3,v 1.6 2019/08/18 21:44:10 schwarze Exp $
 .\" full merge up to: OpenSSL e9b77246 Jan 20 19:58:49 2017 +0100
 .\"
 .\" This file is a derived work.
@@ -65,7 +65,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: August 13 2019 $
+.Dd $Mdocdate: August 18 2019 $
 .Dt CMS_ADD1_RECIPIENT_CERT 3
 .Os
 .Sh NAME
@@ -177,7 +177,7 @@ structure just added or
 .Dv NULL
 if an error occurs.
 .Sh SEE ALSO
-.Xr CMS_decrypt 3 ,
+.Xr CMS_ContentInfo_new 3 ,
 .Xr CMS_encrypt 3 ,
 .Xr CMS_final 3 ,
 .Xr ERR_get_error 3
diff --git a/src/lib/libcrypto/man/CMS_add1_signer.3 b/src/lib/libcrypto/man/CMS_add1_signer.3
index ea7d0a6dc3..e7152cfe6e 100644
--- a/src/lib/libcrypto/man/CMS_add1_signer.3
+++ b/src/lib/libcrypto/man/CMS_add1_signer.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: CMS_add1_signer.3,v 1.5 2019/08/14 11:54:23 schwarze Exp $
+.\" $OpenBSD: CMS_add1_signer.3,v 1.6 2019/08/18 21:44:10 schwarze Exp $
 .\" full merge up to: OpenSSL e9b77246 Jan 20 19:58:49 2017 +0100
 .\"
 .\" This file is a derived work.
@@ -65,7 +65,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: August 14 2019 $
+.Dd $Mdocdate: August 18 2019 $
 .Dt CMS_ADD1_SIGNER 3
 .Os
 .Sh NAME
@@ -222,6 +222,7 @@ structure just added or
 .Dv NULL
 if an error occurs.
 .Sh SEE ALSO
+.Xr CMS_ContentInfo_new 3 ,
 .Xr CMS_final 3 ,
 .Xr CMS_sign 3 ,
 .Xr ERR_get_error 3
diff --git a/src/lib/libcrypto/man/CMS_compress.3 b/src/lib/libcrypto/man/CMS_compress.3
index 8948618d3a..f29a1342d4 100644
--- a/src/lib/libcrypto/man/CMS_compress.3
+++ b/src/lib/libcrypto/man/CMS_compress.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: CMS_compress.3,v 1.5 2019/08/15 11:42:53 schwarze Exp $
+.\" $OpenBSD: CMS_compress.3,v 1.6 2019/08/18 21:44:10 schwarze Exp $
 .\" full merge up to: OpenSSL 99d63d46 Oct 26 13:56:48 2016 -0400
 .\"
 .\" This file is a derived work.
@@ -65,7 +65,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: August 15 2019 $
+.Dd $Mdocdate: August 18 2019 $
 .Dt CMS_COMPRESS 3
 .Os
 .Sh NAME
@@ -155,6 +155,7 @@ if an error occurred.
 The error can be obtained from
 .Xr ERR_get_error 3 .
 .Sh SEE ALSO
+.Xr CMS_ContentInfo_new 3 ,
 .Xr CMS_uncompress 3
 .Sh STANDARDS
 RFC 3274: Compressed Data Content Type for Cryptographic Message Syntax (CMS)
diff --git a/src/lib/libcrypto/man/CMS_decrypt.3 b/src/lib/libcrypto/man/CMS_decrypt.3
index 579d58102f..495bdaaff3 100644
--- a/src/lib/libcrypto/man/CMS_decrypt.3
+++ b/src/lib/libcrypto/man/CMS_decrypt.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: CMS_decrypt.3,v 1.6 2019/08/16 10:43:15 schwarze Exp $
+.\" $OpenBSD: CMS_decrypt.3,v 1.7 2019/08/18 21:44:10 schwarze Exp $
 .\" full merge up to: OpenSSL e9b77246 Jan 20 19:58:49 2017 +0100
 .\"
 .\" This file is a derived work.
@@ -65,7 +65,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: August 16 2019 $
+.Dd $Mdocdate: August 18 2019 $
 .Dt CMS_DECRYPT 3
 .Os
 .Sh NAME
@@ -199,7 +199,9 @@ return 1 for success or 0 for failure.
 The error can be obtained from
 .Xr ERR_get_error 3 .
 .Sh SEE ALSO
-.Xr CMS_encrypt 3
+.Xr CMS_ContentInfo_new 3 ,
+.Xr CMS_encrypt 3 ,
+.Xr CMS_get0_RecipientInfos 3
 .Sh STANDARDS
 RFC 5652: Cryptographic Message Syntax (CMS)
 .Bl -dash -compact -offset indent
diff --git a/src/lib/libcrypto/man/CMS_encrypt.3 b/src/lib/libcrypto/man/CMS_encrypt.3
index 884615e06b..bb0d044526 100644
--- a/src/lib/libcrypto/man/CMS_encrypt.3
+++ b/src/lib/libcrypto/man/CMS_encrypt.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: CMS_encrypt.3,v 1.5 2019/08/16 11:30:10 schwarze Exp $
+.\" $OpenBSD: CMS_encrypt.3,v 1.6 2019/08/18 21:44:10 schwarze Exp $
 .\" full merge up to: OpenSSL 83cf7abf May 29 13:07:08 2018 +0100
 .\"
 .\" This file was written by Dr. Stephen Henson <steve@openssl.org>.
@@ -48,7 +48,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: August 16 2019 $
+.Dd $Mdocdate: August 18 2019 $
 .Dt CMS_ENCRYPT 3
 .Os
 .Sh NAME
@@ -168,6 +168,9 @@ if an error occurred.
 The error can be obtained from
 .Xr ERR_get_error 3 .
 .Sh SEE ALSO
+.Xr CMS_add0_cert 3 ,
+.Xr CMS_add1_recipient_cert 3 ,
+.Xr CMS_ContentInfo_new 3 ,
 .Xr CMS_decrypt 3
 .Sh STANDARDS
 RFC 5652: Cryptographic Message Syntax (CMS)
diff --git a/src/lib/libcrypto/man/CMS_final.3 b/src/lib/libcrypto/man/CMS_final.3
index 2371e4434b..ded92307d0 100644
--- a/src/lib/libcrypto/man/CMS_final.3
+++ b/src/lib/libcrypto/man/CMS_final.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: CMS_final.3,v 1.4 2019/08/11 12:46:38 schwarze Exp $
+.\" $OpenBSD: CMS_final.3,v 1.5 2019/08/18 21:44:10 schwarze Exp $
 .\" full merge up to: OpenSSL 25ccb589 Jul 1 02:02:06 2019 +0800
 .\"
 .\" This file was written by Dr. Stephen Henson <steve@openssl.org>.
@@ -48,7 +48,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: August 11 2019 $
+.Dd $Mdocdate: August 18 2019 $
 .Dt CMS_FINAL 3
 .Os
 .Sh NAME
@@ -90,6 +90,7 @@ streaming I/O functions perform finalisation operations internally.
 .Fn CMS_final
 returns 1 for success or 0 for failure.
 .Sh SEE ALSO
+.Xr CMS_ContentInfo_new 3 ,
 .Xr CMS_encrypt 3 ,
 .Xr CMS_sign 3 ,
 .Xr ERR_get_error 3
diff --git a/src/lib/libcrypto/man/CMS_get0_RecipientInfos.3 b/src/lib/libcrypto/man/CMS_get0_RecipientInfos.3
index fc62d3a08b..783e8e17d8 100644
--- a/src/lib/libcrypto/man/CMS_get0_RecipientInfos.3
+++ b/src/lib/libcrypto/man/CMS_get0_RecipientInfos.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: CMS_get0_RecipientInfos.3,v 1.5 2019/08/17 14:41:01 schwarze Exp $
+.\" $OpenBSD: CMS_get0_RecipientInfos.3,v 1.6 2019/08/18 21:44:10 schwarze Exp $
 .\" full merge up to: OpenSSL e9b77246 Jan 20 19:58:49 2017 +0100
 .\"
 .\" This file was written by Dr. Stephen Henson <steve@openssl.org>.
@@ -48,7 +48,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: August 17 2019 $
+.Dd $Mdocdate: August 18 2019 $
 .Dt CMS_GET0_RECIPIENTINFOS 3
 .Os
 .Sh NAME
@@ -305,6 +305,7 @@ matches or non-zero otherwise.
 Any error can be obtained from
 .Xr ERR_get_error 3 .
 .Sh SEE ALSO
+.Xr CMS_ContentInfo_new 3 ,
 .Xr CMS_decrypt 3
 .Sh STANDARDS
 RFC 5652 Cryptographic Message Syntax (CMS):
diff --git a/src/lib/libcrypto/man/CMS_get0_SignerInfos.3 b/src/lib/libcrypto/man/CMS_get0_SignerInfos.3
index 70cb1c2c1e..50e80ae473 100644
--- a/src/lib/libcrypto/man/CMS_get0_SignerInfos.3
+++ b/src/lib/libcrypto/man/CMS_get0_SignerInfos.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: CMS_get0_SignerInfos.3,v 1.5 2019/08/17 15:23:26 schwarze Exp $
+.\" $OpenBSD: CMS_get0_SignerInfos.3,v 1.6 2019/08/18 21:44:10 schwarze Exp $
 .\" full merge up to: OpenSSL 83cf7abf May 29 13:07:08 2018 +0100
 .\"
 .\" This file was written by Dr. Stephen Henson <steve@openssl.org>.
@@ -48,7 +48,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: August 17 2019 $
+.Dd $Mdocdate: August 18 2019 $
 .Dt CMS_GET0_SIGNERINFOS 3
 .Os
 .Sh NAME
@@ -169,6 +169,7 @@ returns 0 for a match or non-zero otherwise.
 Any error can be obtained from
 .Xr ERR_get_error 3 .
 .Sh SEE ALSO
+.Xr CMS_ContentInfo_new 3 ,
 .Xr CMS_verify 3
 .Sh STANDARDS
 RFC 5652: Cryptographic Message Syntax (CMS)
diff --git a/src/lib/libcrypto/man/CMS_get0_type.3 b/src/lib/libcrypto/man/CMS_get0_type.3
index fe1e999efe..ddafddf7fd 100644
--- a/src/lib/libcrypto/man/CMS_get0_type.3
+++ b/src/lib/libcrypto/man/CMS_get0_type.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: CMS_get0_type.3,v 1.5 2019/08/18 10:19:17 schwarze Exp $
+.\" $OpenBSD: CMS_get0_type.3,v 1.6 2019/08/18 21:44:10 schwarze Exp $
 .\" full merge up to: OpenSSL 72a7a702 Feb 26 14:05:09 2019 +0000
 .\"
 .\" This file is a derived work.
@@ -184,6 +184,10 @@ to the embedded content is stored.
 returns 1 for success or 0 if an error occurred.
 The error can be obtained from
 .Xr ERR_get_error 3 .
+.Sh SEE ALSO
+.Xr CMS_ContentInfo_new 3 ,
+.Xr d2i_CMS_ContentInfo 3 ,
+.Xr SMIME_read_CMS 3
 .Sh STANDARDS
 RFC 5652: Cryptographic Message Syntax
 .Pp
diff --git a/src/lib/libcrypto/man/CMS_get1_ReceiptRequest.3 b/src/lib/libcrypto/man/CMS_get1_ReceiptRequest.3
index c9c8a191e7..1b737ea584 100644
--- a/src/lib/libcrypto/man/CMS_get1_ReceiptRequest.3
+++ b/src/lib/libcrypto/man/CMS_get1_ReceiptRequest.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: CMS_get1_ReceiptRequest.3,v 1.5 2019/08/18 10:54:57 schwarze Exp $
+.\" $OpenBSD: CMS_get1_ReceiptRequest.3,v 1.6 2019/08/18 21:44:10 schwarze Exp $
 .\" full merge up to: OpenSSL 83cf7abf May 29 13:07:08 2018 +0100
 .\"
 .\" This file was written by Dr. Stephen Henson <steve@openssl.org>.
@@ -178,6 +178,7 @@ returns 1 is a signed receipt request is found and decoded.
 It returns 0 if a signed receipt request is not present or -1 if it is
 present but malformed.
 .Sh SEE ALSO
+.Xr CMS_ContentInfo_new 3 ,
 .Xr CMS_sign 3 ,
 .Xr CMS_sign_receipt 3 ,
 .Xr CMS_verify 3 ,
diff --git a/src/lib/libcrypto/man/CMS_sign.3 b/src/lib/libcrypto/man/CMS_sign.3
index 1dfd153ee2..33797b98a3 100644
--- a/src/lib/libcrypto/man/CMS_sign.3
+++ b/src/lib/libcrypto/man/CMS_sign.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: CMS_sign.3,v 1.6 2019/08/18 12:06:51 schwarze Exp $
+.\" $OpenBSD: CMS_sign.3,v 1.7 2019/08/18 21:44:10 schwarze Exp $
 .\" full merge up to: OpenSSL e9b77246 Jan 20 19:58:49 2017 +0100
 .\"
 .\" This file was written by Dr. Stephen Henson <steve@openssl.org>.
@@ -216,6 +216,11 @@ if an error occurred.
 The error can be obtained from
 .Xr ERR_get_error 3 .
 .Sh SEE ALSO
+.Xr CMS_add0_cert 3 ,
+.Xr CMS_add1_signer 3 ,
+.Xr CMS_ContentInfo_new 3 ,
+.Xr CMS_final 3 ,
+.Xr CMS_sign_receipt 3 ,
 .Xr CMS_verify 3
 .Sh STANDARDS
 RFC 5652: Cryptographic Message Syntax (CMS)
diff --git a/src/lib/libcrypto/man/CMS_sign_receipt.3 b/src/lib/libcrypto/man/CMS_sign_receipt.3
index e827900a84..6419ae4bb8 100644
--- a/src/lib/libcrypto/man/CMS_sign_receipt.3
+++ b/src/lib/libcrypto/man/CMS_sign_receipt.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: CMS_sign_receipt.3,v 1.5 2019/08/18 12:06:51 schwarze Exp $
+.\" $OpenBSD: CMS_sign_receipt.3,v 1.6 2019/08/18 21:44:10 schwarze Exp $
 .\" full merge up to: OpenSSL e9b77246 Jan 20 19:58:49 2017 +0100
 .\"
 .\" This file was written by Dr. Stephen Henson <steve@openssl.org>.
@@ -106,6 +106,8 @@ if an error occurred.
 The error can be obtained from
 .Xr ERR_get_error 3 .
 .Sh SEE ALSO
+.Xr CMS_ContentInfo_new 3 ,
+.Xr CMS_get1_ReceiptRequest 3 ,
 .Xr CMS_sign 3 ,
 .Xr CMS_verify_receipt 3
 .Sh STANDARDS
diff --git a/src/lib/libcrypto/man/CMS_uncompress.3 b/src/lib/libcrypto/man/CMS_uncompress.3
index 786828b1c5..d93c49c20e 100644
--- a/src/lib/libcrypto/man/CMS_uncompress.3
+++ b/src/lib/libcrypto/man/CMS_uncompress.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: CMS_uncompress.3,v 1.5 2019/08/15 15:46:51 schwarze Exp $
+.\" $OpenBSD: CMS_uncompress.3,v 1.6 2019/08/18 21:44:10 schwarze Exp $
 .\" full merge up to: OpenSSL 99d63d46 Oct 26 13:56:48 2016 -0400
 .\"
 .\" This file was written by Dr. Stephen Henson <steve@openssl.org>.
@@ -48,7 +48,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: August 15 2019 $
+.Dd $Mdocdate: August 18 2019 $
 .Dt CMS_UNCOMPRESS 3
 .Os
 .Sh NAME
@@ -98,7 +98,8 @@ returns 1 for success or 0 for failure.
 The error can be obtained from
 .Xr ERR_get_error 3 .
 .Sh SEE ALSO
-.Xr CMS_compress 3
+.Xr CMS_compress 3 ,
+.Xr CMS_ContentInfo_new 3
 .Sh STANDARDS
 RFC 3274: Compressed Data Content Type for Cryptographic Message Syntax (CMS)
 .Sh HISTORY
diff --git a/src/lib/libcrypto/man/CMS_verify.3 b/src/lib/libcrypto/man/CMS_verify.3
index ae489933de..a7b95bcaa6 100644
--- a/src/lib/libcrypto/man/CMS_verify.3
+++ b/src/lib/libcrypto/man/CMS_verify.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: CMS_verify.3,v 1.5 2019/08/18 12:06:51 schwarze Exp $
+.\" $OpenBSD: CMS_verify.3,v 1.6 2019/08/18 21:44:10 schwarze Exp $
 .\" full merge up to: OpenSSL 35fd9953 May 28 14:49:38 2019 +0200
 .\"
 .\" This file was written by Dr. Stephen Henson <steve@openssl.org>.
@@ -202,7 +202,10 @@ if an error occurred.
 The error can be obtained from
 .Xr ERR_get_error 3 .
 .Sh SEE ALSO
-.Xr CMS_sign 3
+.Xr CMS_ContentInfo_new 3 ,
+.Xr CMS_get0_SignerInfos 3 ,
+.Xr CMS_sign 3 ,
+.Xr CMS_verify_receipt 3
 .Sh STANDARDS
 RFC 5652: Cryptographic Message Syntax (CMS),
 section 5.1: SignedData Type
diff --git a/src/lib/libcrypto/man/CMS_verify_receipt.3 b/src/lib/libcrypto/man/CMS_verify_receipt.3
index 8f9a86f128..7fd9e00d46 100644
--- a/src/lib/libcrypto/man/CMS_verify_receipt.3
+++ b/src/lib/libcrypto/man/CMS_verify_receipt.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: CMS_verify_receipt.3,v 1.5 2019/08/18 12:06:51 schwarze Exp $
+.\" $OpenBSD: CMS_verify_receipt.3,v 1.6 2019/08/18 21:44:10 schwarze Exp $
 .\" full merge up to: OpenSSL e9b77246 Jan 20 19:58:49 2017 +0100
 .\"
 .\" This file was written by Dr. Stephen Henson <steve@openssl.org>.
@@ -97,6 +97,8 @@ returns 1 for a successful verification or 0 if an error occurred.
 The error can be obtained from
 .Xr ERR_get_error 3 .
 .Sh SEE ALSO
+.Xr CMS_ContentInfo_new 3 ,
+.Xr CMS_get1_ReceiptRequest 3 ,
 .Xr CMS_sign_receipt 3 ,
 .Xr CMS_verify 3
 .Sh STANDARDS
diff --git a/src/lib/libcrypto/man/PEM_write_bio_CMS_stream.3 b/src/lib/libcrypto/man/PEM_write_bio_CMS_stream.3
index fc3e78ed30..59568b7850 100644
--- a/src/lib/libcrypto/man/PEM_write_bio_CMS_stream.3
+++ b/src/lib/libcrypto/man/PEM_write_bio_CMS_stream.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: PEM_write_bio_CMS_stream.3,v 1.2 2019/08/11 12:46:38 schwarze Exp $
+.\" $OpenBSD: PEM_write_bio_CMS_stream.3,v 1.3 2019/08/18 21:44:10 schwarze Exp $
 .\" full merge up to: OpenSSL df75c2bf Dec 9 01:02:36 2018 +0100
 .\"
 .\" This file was written by Dr. Stephen Henson <steve@openssl.org>.
@@ -48,7 +48,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: August 11 2019 $
+.Dd $Mdocdate: August 18 2019 $
 .Dt PEM_WRITE_BIO_CMS_STREAM 3
 .Os
 .Sh NAME
@@ -79,6 +79,7 @@ supporting streaming.
 .Fn PEM_write_bio_CMS_stream
 returns 1 for success or 0 for failure.
 .Sh SEE ALSO
+.Xr CMS_ContentInfo_new 3 ,
 .Xr CMS_decrypt 3 ,
 .Xr CMS_encrypt 3 ,
 .Xr CMS_sign 3 ,
diff --git a/src/lib/libcrypto/man/SMIME_read_CMS.3 b/src/lib/libcrypto/man/SMIME_read_CMS.3
index af2facf129..267c98ed29 100644
--- a/src/lib/libcrypto/man/SMIME_read_CMS.3
+++ b/src/lib/libcrypto/man/SMIME_read_CMS.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: SMIME_read_CMS.3,v 1.4 2019/08/18 13:02:37 schwarze Exp $
+.\" $OpenBSD: SMIME_read_CMS.3,v 1.5 2019/08/18 21:44:10 schwarze Exp $
 .\" full merge up to: OpenSSL b97fdb57 Nov 11 09:33:09 2016 +0100
 .\"
 .\" This file was written by Dr. Stephen Henson <steve@openssl.org>.
@@ -103,11 +103,11 @@ if an error occurred.
 The error can be obtained from
 .Xr ERR_get_error 3 .
 .Sh SEE ALSO
+.Xr CMS_ContentInfo_new 3 ,
 .Xr CMS_decrypt 3 ,
-.Xr CMS_encrypt 3 ,
 .Xr CMS_get0_type 3 ,
-.Xr CMS_sign 3 ,
 .Xr CMS_verify 3 ,
+.Xr d2i_CMS_ContentInfo 3 ,
 .Xr SMIME_write_CMS 3
 .Sh HISTORY
 .Fn SMIME_read_CMS
diff --git a/src/lib/libcrypto/man/SMIME_write_CMS.3 b/src/lib/libcrypto/man/SMIME_write_CMS.3
index ddb71e98e2..bd580992fd 100644
--- a/src/lib/libcrypto/man/SMIME_write_CMS.3
+++ b/src/lib/libcrypto/man/SMIME_write_CMS.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: SMIME_write_CMS.3,v 1.3 2019/08/18 13:02:37 schwarze Exp $
+.\" $OpenBSD: SMIME_write_CMS.3,v 1.4 2019/08/18 21:44:10 schwarze Exp $
 .\" full merge up to: OpenSSL 99d63d46 Oct 26 13:56:48 2016 -0400
 .\"
 .\" This file was written by Dr. Stephen Henson <steve@openssl.org>.
@@ -116,10 +116,10 @@ used.
 .Fn SMIME_write_CMS
 returns 1 for success or 0 for failure.
 .Sh SEE ALSO
-.Xr CMS_decrypt 3 ,
+.Xr CMS_ContentInfo_new 3 ,
 .Xr CMS_encrypt 3 ,
 .Xr CMS_sign 3 ,
-.Xr CMS_verify 3 ,
+.Xr d2i_CMS_ContentInfo 3 ,
 .Xr ERR_get_error 3
 .Sh HISTORY
 .Fn SMIME_write_CMS
diff --git a/src/lib/libcrypto/man/d2i_CMS_ContentInfo.3 b/src/lib/libcrypto/man/d2i_CMS_ContentInfo.3
index 2805672998..d927697f60 100644
--- a/src/lib/libcrypto/man/d2i_CMS_ContentInfo.3
+++ b/src/lib/libcrypto/man/d2i_CMS_ContentInfo.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: d2i_CMS_ContentInfo.3,v 1.1 2019/08/12 14:24:38 schwarze Exp $
+.\" $OpenBSD: d2i_CMS_ContentInfo.3,v 1.2 2019/08/18 21:44:10 schwarze Exp $
 .\" Copyright (c) 2019 Ingo Schwarze <schwarze@openbsd.org>
 .\"
 .\" Permission to use, copy, modify, and distribute this software for any
@@ -13,7 +13,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: August 12 2019 $
+.Dd $Mdocdate: August 18 2019 $
 .Dt D2I_CMS_CONTENTINFO 3
 .Os
 .Sh NAME
@@ -114,6 +114,8 @@ For all functions, the error code can be obtained by
 .Sh SEE ALSO
 .Xr ASN1_item_d2i 3 ,
 .Xr CMS_ContentInfo_new 3 ,
+.Xr CMS_get0_type 3 ,
+.Xr CMS_ReceiptRequest_create0 3 ,
 .Xr i2d_CMS_bio_stream 3
 .Sh STANDARDS
 RFC 5652: Cryptographic Message Syntax, section 3: General Syntax
diff --git a/src/lib/libcrypto/man/i2d_CMS_bio_stream.3 b/src/lib/libcrypto/man/i2d_CMS_bio_stream.3
index 8f2a2c5b67..ecf069c158 100644
--- a/src/lib/libcrypto/man/i2d_CMS_bio_stream.3
+++ b/src/lib/libcrypto/man/i2d_CMS_bio_stream.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: i2d_CMS_bio_stream.3,v 1.2 2019/08/11 12:46:38 schwarze Exp $
+.\" $OpenBSD: i2d_CMS_bio_stream.3,v 1.3 2019/08/18 21:44:10 schwarze Exp $
 .\" full merge up to: OpenSSL df75c2bf Dec 9 01:02:36 2018 +0100
 .\"
 .\" This file was written by Dr. Stephen Henson <steve@openssl.org>.
@@ -48,7 +48,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: August 11 2019 $
+.Dd $Mdocdate: August 18 2019 $
 .Dt I2D_CMS_BIO_STREAM 3
 .Os
 .Sh NAME
@@ -79,10 +79,9 @@ supporting streaming.
 .Fn i2d_CMS_bio_stream
 returns 1 for success or 0 for failure.
 .Sh SEE ALSO
-.Xr CMS_decrypt 3 ,
+.Xr CMS_ContentInfo_new 3 ,
 .Xr CMS_encrypt 3 ,
 .Xr CMS_sign 3 ,
-.Xr CMS_verify 3 ,
 .Xr ERR_get_error 3 ,
 .Xr PEM_write_bio_CMS_stream 3 ,
 .Xr SMIME_write_CMS 3