21 files changed, 129 insertions, 78 deletions

diff --git a/src/lib/libcrypto/man/BIO_new_CMS.3 b/src/lib/libcrypto/man/BIO_new_CMS.3
index d35fb0b7bf..5b18ed1580 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.4 2019/08/10 23:41:22 schwarze Exp $
+.\" $OpenBSD: BIO_new_CMS.3,v 1.5 2019/08/11 12:46:38 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 10 2019 $
+.Dd $Mdocdate: August 11 2019 $
 .Dt BIO_NEW_CMS 3
 .Os
 .Sh NAME
@@ -130,9 +130,10 @@ The error can be obtained from
 .Xr CMS_encrypt 3 ,
 .Xr CMS_sign 3
 .Sh HISTORY
-The
 .Fn BIO_new_CMS
-function was added in OpenSSL 1.0.0.
+first appeared in OpenSSL 1.0.0
+and has been available since
+.Ox 6.6 .
 .Sh BUGS
 There is currently no corresponding inverse BIO
 which can decode a CMS structure on the fly.
diff --git a/src/lib/libcrypto/man/CMS_add0_cert.3 b/src/lib/libcrypto/man/CMS_add0_cert.3
index 9f99e2259f..80808c1785 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.3 2019/08/10 23:41:22 schwarze Exp $
+.\" $OpenBSD: CMS_add0_cert.3,v 1.4 2019/08/11 12:46:38 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 10 2019 $
+.Dd $Mdocdate: August 11 2019 $
 .Dt CMS_ADD0_CERT 3
 .Os
 .Sh NAME
@@ -171,7 +171,11 @@ type is invalid.
 .Fn CMS_add0_cert ,
 .Fn CMS_add1_cert ,
 .Fn CMS_get1_certs ,
-.Fn CMS_add0_crl
+.Fn CMS_add0_crl ,
 and
 .Fn CMS_get1_crls
-were all first added to OpenSSL 0.9.8.
+first appeared in OpenSSL 0.9.8h and
+.Fn CMS_add1_crl
+in OpenSSL 1.0.0.
+These functions have been available since
+.Ox 6.6 .
diff --git a/src/lib/libcrypto/man/CMS_add1_recipient_cert.3 b/src/lib/libcrypto/man/CMS_add1_recipient_cert.3
index 47307fdaa1..d8aacb203c 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.3 2019/08/10 23:41:22 schwarze Exp $
+.\" $OpenBSD: CMS_add1_recipient_cert.3,v 1.4 2019/08/11 12:46:38 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 10 2019 $
+.Dd $Mdocdate: August 11 2019 $
 .Dt CMS_ADD1_RECIPIENT_CERT 3
 .Os
 .Sh NAME
@@ -162,4 +162,6 @@ if an error occurs.
 .Fn CMS_add1_recipient_cert
 and
 .Fn CMS_add0_recipient_key
-were added to OpenSSL 0.9.8.
+first appeared in OpenSSL 0.9.8h
+and have been available since
+.Ox 6.6 .
diff --git a/src/lib/libcrypto/man/CMS_add1_signer.3 b/src/lib/libcrypto/man/CMS_add1_signer.3
index 065e15c7be..8f08dac6d6 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.3 2019/08/10 23:41:22 schwarze Exp $
+.\" $OpenBSD: CMS_add1_signer.3,v 1.4 2019/08/11 12:46:38 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 10 2019 $
+.Dd $Mdocdate: August 11 2019 $
 .Dt CMS_ADD1_SIGNER 3
 .Os
 .Sh NAME
@@ -200,4 +200,8 @@ if an error occurs.
 .Xr ERR_get_error 3
 .Sh HISTORY
 .Fn CMS_add1_signer
-was added to OpenSSL 0.9.8.
+and
+.Fn CMS_SignerInfo_sign
+first appeared in OpenSSL 0.9.8h
+and have been available since
+.Ox 6.6 .
diff --git a/src/lib/libcrypto/man/CMS_compress.3 b/src/lib/libcrypto/man/CMS_compress.3
index 64bab79617..0b3b105c16 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.3 2019/08/10 23:41:22 schwarze Exp $
+.\" $OpenBSD: CMS_compress.3,v 1.4 2019/08/11 12:46:38 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 10 2019 $
+.Dd $Mdocdate: August 11 2019 $
 .Dt CMS_COMPRESS 3
 .Os
 .Sh NAME
@@ -151,7 +151,10 @@ The error can be obtained from
 .Xr CMS_uncompress 3
 .Sh HISTORY
 .Fn CMS_compress
-was added to OpenSSL 0.9.8.
+first appeared in OpenSSL 0.9.8h
+and has been available since
+.Ox 6.6 .
+.Pp
 The
 .Dv CMS_STREAM
-flag was added in OpenSSL 1.0.0.
+flag first appeared in OpenSSL 1.0.0.
diff --git a/src/lib/libcrypto/man/CMS_decrypt.3 b/src/lib/libcrypto/man/CMS_decrypt.3
index de37b357a1..5433411a39 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.3 2019/08/10 23:41:22 schwarze Exp $
+.\" $OpenBSD: CMS_decrypt.3,v 1.4 2019/08/11 12:46:38 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 10 2019 $
+.Dd $Mdocdate: August 11 2019 $
 .Dt CMS_DECRYPT 3
 .Os
 .Sh NAME
@@ -160,7 +160,9 @@ The error can be obtained from
 .Xr CMS_encrypt 3
 .Sh HISTORY
 .Fn CMS_decrypt
-was added to OpenSSL 0.9.8.
+first appeared in OpenSSL 0.9.8h
+and has been available since
+.Ox 6.6 .
 .Sh BUGS
 The lack of single pass processing and the need to hold all data in
 memory as mentioned in
diff --git a/src/lib/libcrypto/man/CMS_encrypt.3 b/src/lib/libcrypto/man/CMS_encrypt.3
index 8550de2c9f..a2e6b837ac 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.3 2019/08/10 23:41:22 schwarze Exp $
+.\" $OpenBSD: CMS_encrypt.3,v 1.4 2019/08/11 12:46:38 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 10 2019 $
+.Dd $Mdocdate: August 11 2019 $
 .Dt CMS_ENCRYPT 3
 .Os
 .Sh NAME
@@ -184,7 +184,10 @@ The error can be obtained from
 .Xr CMS_decrypt 3
 .Sh HISTORY
 .Fn CMS_encrypt
-was added to OpenSSL 0.9.8.
+first appeared in OpenSSL 0.9.8h
+and has been available since
+.Ox 6.6 .
+.Pp
 The
-.Sy CMS_STREAM
-flag was first supported in OpenSSL 1.0.0.
+.Dv CMS_STREAM
+flag first appeared in OpenSSL 1.0.0.
diff --git a/src/lib/libcrypto/man/CMS_final.3 b/src/lib/libcrypto/man/CMS_final.3
index 8404005c74..2371e4434b 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.3 2019/08/10 23:41:22 schwarze Exp $
+.\" $OpenBSD: CMS_final.3,v 1.4 2019/08/11 12:46:38 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 10 2019 $
+.Dd $Mdocdate: August 11 2019 $
 .Dt CMS_FINAL 3
 .Os
 .Sh NAME
@@ -95,4 +95,6 @@ returns 1 for success or 0 for failure.
 .Xr ERR_get_error 3
 .Sh HISTORY
 .Fn CMS_final
-was added to OpenSSL 0.9.8.
+first appeared in OpenSSL 0.9.8h
+and has been available since
+.Ox 6.6 .
diff --git a/src/lib/libcrypto/man/CMS_get0_RecipientInfos.3 b/src/lib/libcrypto/man/CMS_get0_RecipientInfos.3
index 07c16c5675..6bf506dfbe 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.3 2019/08/10 23:41:22 schwarze Exp $
+.\" $OpenBSD: CMS_get0_RecipientInfos.3,v 1.4 2019/08/11 12:46:38 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 10 2019 $
+.Dd $Mdocdate: August 11 2019 $
 .Dt CMS_GET0_RECIPIENTINFOS 3
 .Os
 .Sh NAME
@@ -320,4 +320,9 @@ Any error can be obtained from
 .Sh SEE ALSO
 .Xr CMS_decrypt 3
 .Sh HISTORY
-These functions were first was added to OpenSSL 0.9.8.
+These functions first appeared in OpenSSL 0.9.8h,
+except that
+.Fn CMS_RecipientInfo_encrypt
+first appeared in OpenSSL 1.0.2.
+They have been available since
+.Ox 6.6 .
diff --git a/src/lib/libcrypto/man/CMS_get0_SignerInfos.3 b/src/lib/libcrypto/man/CMS_get0_SignerInfos.3
index b9c8fee366..8f98c181ab 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.3 2019/08/10 23:41:22 schwarze Exp $
+.\" $OpenBSD: CMS_get0_SignerInfos.3,v 1.4 2019/08/11 12:46:38 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 10 2019 $
+.Dd $Mdocdate: August 11 2019 $
 .Dt CMS_GET0_SIGNERINFOS 3
 .Os
 .Sh NAME
@@ -177,4 +177,13 @@ Any error can be obtained from
 .Sh SEE ALSO
 .Xr CMS_verify 3
 .Sh HISTORY
-These functions were first was added to OpenSSL 0.9.8.
+.Fn CMS_get0_SignerInfos ,
+.Fn CMS_SignerInfo_get0_signer_id ,
+.Fn CMS_SignerInfo_cert_cmp ,
+and
+.Fn CMS_SignerInfo_set1_signer_cert
+first appeared in OpenSSL 0.9.8h and
+.Fn CMS_SignerInfo_get0_signature
+in OpenSSL 1.0.2.
+These functions have been available since
+.Ox 6.6 .
diff --git a/src/lib/libcrypto/man/CMS_get0_type.3 b/src/lib/libcrypto/man/CMS_get0_type.3
index 982826c7ca..82dd660e3a 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.3 2019/08/10 23:41:22 schwarze Exp $
+.\" $OpenBSD: CMS_get0_type.3,v 1.4 2019/08/11 12:46:38 schwarze Exp $
 .\" full merge up to: OpenSSL 72a7a702 Feb 26 14:05:09 2019 +0000
 .\"
 .\" 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 10 2019 $
+.Dd $Mdocdate: August 11 2019 $
 .Dt CMS_GET0_TYPE 3
 .Os
 .Sh NAME
@@ -167,8 +167,6 @@ returns 1 for success or 0 if an error occurred.
 The error can be obtained from
 .Xr ERR_get_error 3 .
 .Sh HISTORY
-.Fn CMS_get0_type ,
-.Fn CMS_set1_eContentType ,
-and
-.Fn CMS_get0_eContentType
-were all first added to OpenSSL 0.9.8.
+These functions first appeared in OpenSSL 0.9.8h
+and have been available since
+.Ox 6.6 .
diff --git a/src/lib/libcrypto/man/CMS_get1_ReceiptRequest.3 b/src/lib/libcrypto/man/CMS_get1_ReceiptRequest.3
index d944f606d8..f012ca129b 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.3 2019/08/10 23:41:22 schwarze Exp $
+.\" $OpenBSD: CMS_get1_ReceiptRequest.3,v 1.4 2019/08/11 12:46:38 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 10 2019 $
+.Dd $Mdocdate: August 11 2019 $
 .Dt CMS_GET1_RECEIPTREQUEST 3
 .Os
 .Sh NAME
@@ -172,4 +172,6 @@ present but malformed.
 .Fn CMS_get1_ReceiptRequest ,
 and
 .Fn CMS_ReceiptRequest_get0_values
-were added to OpenSSL 0.9.8.
+first appeared in OpenSSL 0.9.8h
+and have been available since
+.Ox 6.6 .
diff --git a/src/lib/libcrypto/man/CMS_sign.3 b/src/lib/libcrypto/man/CMS_sign.3
index 54d95f4a5d..2857fb96ae 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.3 2019/08/10 23:41:22 schwarze Exp $
+.\" $OpenBSD: CMS_sign.3,v 1.4 2019/08/11 12:46:38 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 10 2019 $
+.Dd $Mdocdate: August 11 2019 $
 .Dt CMS_SIGN 3
 .Os
 .Sh NAME
@@ -214,11 +214,8 @@ The error can be obtained from
 .Xr CMS_verify 3
 .Sh HISTORY
 .Fn CMS_sign
-was added to OpenSSL 0.9.8.
-.Pp
-The
-.Dv CMS_STREAM
-flag is only supported for detached data in OpenSSL 0.9.8, it is
-supported for embedded data in OpenSSL 1.0.0 and later.
+first appeared in OpenSSL 0.9.8h
+and has been available since
+.Ox 6.6 .
 .Sh BUGS
 Some attributes such as counter signatures are not supported.
diff --git a/src/lib/libcrypto/man/CMS_sign_receipt.3 b/src/lib/libcrypto/man/CMS_sign_receipt.3
index 7ddff976cc..88d03d79db 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.3 2019/08/10 23:41:22 schwarze Exp $
+.\" $OpenBSD: CMS_sign_receipt.3,v 1.4 2019/08/11 12:46:38 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 10 2019 $
+.Dd $Mdocdate: August 11 2019 $
 .Dt CMS_SIGN_RECEIPT 3
 .Os
 .Sh NAME
@@ -107,4 +107,6 @@ The error can be obtained from
 .Xr CMS_verify_receipt 3
 .Sh HISTORY
 .Fn CMS_sign_receipt
-was added to OpenSSL 0.9.8.
+first appeared in OpenSSL 0.9.8h
+and has been available since
+.Ox 6.6 .
diff --git a/src/lib/libcrypto/man/CMS_uncompress.3 b/src/lib/libcrypto/man/CMS_uncompress.3
index 50926b7358..1b99e72d28 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.3 2019/08/10 23:41:22 schwarze Exp $
+.\" $OpenBSD: CMS_uncompress.3,v 1.4 2019/08/11 12:46:38 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 10 2019 $
+.Dd $Mdocdate: August 11 2019 $
 .Dt CMS_UNCOMPRESS 3
 .Os
 .Sh NAME
@@ -102,7 +102,9 @@ The error can be obtained from
 .Xr CMS_compress 3
 .Sh HISTORY
 .Fn CMS_uncompress
-was added to OpenSSL 0.9.8.
+first appeared in OpenSSL 0.9.8h
+and has been available since
+.Ox 6.6 .
 .Sh BUGS
 The lack of single pass processing and the need to hold all data in
 memory as mentioned in
diff --git a/src/lib/libcrypto/man/CMS_verify.3 b/src/lib/libcrypto/man/CMS_verify.3
index cec1dc06d8..5b17a75ca0 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.3 2019/08/10 23:41:22 schwarze Exp $
+.\" $OpenBSD: CMS_verify.3,v 1.4 2019/08/11 12:46:38 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>.
@@ -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 10 2019 $
+.Dd $Mdocdate: August 11 2019 $
 .Dt CMS_VERIFY 3
 .Os
 .Sh NAME
@@ -211,8 +211,9 @@ The error can be obtained from
 .Sh SEE ALSO
 .Xr CMS_sign 3
 .Sh HISTORY
-.Fn CMS_verify
-was added to OpenSSL 0.9.8.
+These functions first appeared in OpenSSL 0.9.8h
+and have been available since
+.Ox 6.6 .
 .Sh BUGS
 The trusted certificate store is not searched for the signing certificate.
 This is primarily due to the inadequacies of the current
diff --git a/src/lib/libcrypto/man/CMS_verify_receipt.3 b/src/lib/libcrypto/man/CMS_verify_receipt.3
index 33bb43ed8d..7e74faa3e2 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.3 2019/08/10 23:41:22 schwarze Exp $
+.\" $OpenBSD: CMS_verify_receipt.3,v 1.4 2019/08/11 12:46:38 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 10 2019 $
+.Dd $Mdocdate: August 11 2019 $
 .Dt CMS_VERIFY_RECEIPT 3
 .Os
 .Sh NAME
@@ -101,4 +101,6 @@ The error can be obtained from
 .Xr CMS_verify 3
 .Sh HISTORY
 .Fn CMS_verify_receipt
-was added to OpenSSL 0.9.8.
+first appeared in OpenSSL 0.9.8h
+and has been available since
+.Ox 6.6 .
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 ad1688ba14..fc3e78ed30 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.1 2019/08/10 23:41:22 schwarze Exp $
+.\" $OpenBSD: PEM_write_bio_CMS_stream.3,v 1.2 2019/08/11 12:46:38 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 10 2019 $
+.Dd $Mdocdate: August 11 2019 $
 .Dt PEM_WRITE_BIO_CMS_STREAM 3
 .Os
 .Sh NAME
@@ -88,6 +88,7 @@ returns 1 for success or 0 for failure.
 .Xr PEM_write 3 ,
 .Xr SMIME_write_CMS 3
 .Sh HISTORY
-The
 .Fn PEM_write_bio_CMS_stream
-function was added in OpenSSL 1.0.0.
+first appeared in OpenSSL 1.0.0
+and has been available since
+.Ox 6.6 .
diff --git a/src/lib/libcrypto/man/SMIME_read_CMS.3 b/src/lib/libcrypto/man/SMIME_read_CMS.3
index 17f60b11ec..5176aed0e6 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.1 2019/08/10 23:41:22 schwarze Exp $
+.\" $OpenBSD: SMIME_read_CMS.3,v 1.2 2019/08/11 12:46:38 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>.
@@ -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 10 2019 $
+.Dd $Mdocdate: August 11 2019 $
 .Dt SMIME_READ_CMS 3
 .Os
 .Sh NAME
@@ -129,6 +129,11 @@ The error can be obtained from
 .Xr CMS_type 3 ,
 .Xr CMS_verify 3 ,
 .Xr SMIME_write_CMS 3
+.Sh HISTORY
+.Fn SMIME_read_CMS
+first appeared in OpenSSL 0.9.8h
+and has been available since
+.Ox 6.6 .
 .Sh BUGS
 The MIME parser used by
 .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 c9afa5e5a5..c516b79250 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.1 2019/08/10 23:41:22 schwarze Exp $
+.\" $OpenBSD: SMIME_write_CMS.3,v 1.2 2019/08/11 12:46:38 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 10 2019 $
+.Dd $Mdocdate: August 11 2019 $
 .Dt SMIME_WRITE_CMS 3
 .Os
 .Sh NAME
@@ -127,6 +127,11 @@ returns 1 for success or 0 for failure.
 .Xr CMS_sign 3 ,
 .Xr CMS_verify 3 ,
 .Xr ERR_get_error 3
+.Sh HISTORY
+.Fn SMIME_write_CMS
+first appeared in OpenSSL 0.9.8h
+and has been available since
+.Ox 6.6 .
 .Sh BUGS
 .Fn SMIME_write_CMS
 always base64 encodes CMS structures.
diff --git a/src/lib/libcrypto/man/i2d_CMS_bio_stream.3 b/src/lib/libcrypto/man/i2d_CMS_bio_stream.3
index 3615c01ccb..8f2a2c5b67 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.1 2019/08/10 23:41:22 schwarze Exp $
+.\" $OpenBSD: i2d_CMS_bio_stream.3,v 1.2 2019/08/11 12:46:38 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 10 2019 $
+.Dd $Mdocdate: August 11 2019 $
 .Dt I2D_CMS_BIO_STREAM 3
 .Os
 .Sh NAME
@@ -87,9 +87,10 @@ returns 1 for success or 0 for failure.
 .Xr PEM_write_bio_CMS_stream 3 ,
 .Xr SMIME_write_CMS 3
 .Sh HISTORY
-The
 .Fn i2d_CMS_bio_stream
-function was added in OpenSSL 1.0.0.
+first appeared in OpenSSL 1.0.0
+and has been available since
+.Ox 6.6 .
 .Sh BUGS
 The prefix "i2d" is arguably wrong because the function outputs BER
 format.