52 files changed, 289 insertions, 155 deletions

diff --git a/src/lib/libcrypto/man/ASN1_STRING_length.3 b/src/lib/libcrypto/man/ASN1_STRING_length.3
index 1ff8f94103..7e10d131fd 100644
--- a/src/lib/libcrypto/man/ASN1_STRING_length.3
+++ b/src/lib/libcrypto/man/ASN1_STRING_length.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ASN1_STRING_length.3,v 1.12 2018/03/22 17:11:04 schwarze Exp $
+.\" $OpenBSD: ASN1_STRING_length.3,v 1.13 2018/03/23 23:18:17 schwarze Exp $
 .\" full merge up to: OpenSSL 61f805c1 Jan 16 01:01:46 2018 +0800
 .\"
 .\" This file is a derived work.
@@ -66,7 +66,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: March 22 2018 $
+.Dd $Mdocdate: March 23 2018 $
 .Dt ASN1_STRING_LENGTH 3
 .Os
 .Sh NAME
@@ -309,3 +309,7 @@ first appeared in OpenSSL 0.9.5 and has been available since
 .Fn ASN1_STRING_to_UTF8
 first appeared in OpenSSL 0.9.6 and has been available since
 .Ox 2.9 .
+.Pp
+.Fn ASN1_STRING_get0_data
+first appeared in OpenSSL 1.1.0 and has been available since
+.Ox 6.3 .
diff --git a/src/lib/libcrypto/man/ASN1_TIME_set.3 b/src/lib/libcrypto/man/ASN1_TIME_set.3
index f299353e44..3d218745b3 100644
--- a/src/lib/libcrypto/man/ASN1_TIME_set.3
+++ b/src/lib/libcrypto/man/ASN1_TIME_set.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: ASN1_TIME_set.3,v 1.9 2018/03/23 04:34:23 schwarze Exp $
+.\"     $OpenBSD: ASN1_TIME_set.3,v 1.10 2018/03/23 23:18:17 schwarze Exp $
 .\"     OpenSSL ASN1_TIME_set.pod cf37aaa3 Aug 4 11:24:03 2017 +1000
 .\"     OpenSSL ASN1_TIME_set.pod e9b77246 Jan 20 19:58:49 2017 +0100
 .\"
@@ -433,9 +433,6 @@ and
 .Fn ASN1_TIME_set_string
 first appeared in OpenSSL 1.0.0 and have been available since
 .Ox 4.9 .
-.Pp
-.Fn ASN1_TIME_cmp_time_t
-first appeared in OpenSSL 1.1.1.
 .Sh CAVEATS
 Some applications add offset times directly to a
 .Vt time_t
diff --git a/src/lib/libcrypto/man/ASN1_time_parse.3 b/src/lib/libcrypto/man/ASN1_time_parse.3
index 62acf48f6e..8604e18123 100644
--- a/src/lib/libcrypto/man/ASN1_time_parse.3
+++ b/src/lib/libcrypto/man/ASN1_time_parse.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ASN1_time_parse.3,v 1.6 2018/02/15 09:28:59 schwarze Exp $
+.\" $OpenBSD: ASN1_time_parse.3,v 1.7 2018/03/23 23:18:17 schwarze Exp $
 .\"
 .\" Copyright (c) 2016 Bob Beck <beck@openbsd.org>
 .\"
@@ -14,7 +14,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: February 15 2018 $
+.Dd $Mdocdate: March 23 2018 $
 .Dt ASN1_TIME_PARSE 3
 .Os
 .Sh NAME
@@ -125,3 +125,13 @@ returns a pointer to an
 structure or
 .Dv NULL
 if an error occurred.
+.Sh HISTORY
+.Fn ASN1_time_parse
+and
+.Fn ASN1_time_tm_cmp
+first appeared in
+.Ox 6.1
+and
+.Fn ASN1_TIME_set_tm
+in
+.Ox 6.2 .
diff --git a/src/lib/libcrypto/man/BIO_get_data.3 b/src/lib/libcrypto/man/BIO_get_data.3
index aa2707de82..70944255e4 100644
--- a/src/lib/libcrypto/man/BIO_get_data.3
+++ b/src/lib/libcrypto/man/BIO_get_data.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: BIO_get_data.3,v 1.2 2018/02/24 15:03:35 schwarze Exp $
+.\" $OpenBSD: BIO_get_data.3,v 1.3 2018/03/23 23:18:17 schwarze Exp $
 .\" selective merge up to: OpenSSL e90fc053 Jul 15 09:39:45 2017 -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: February 24 2018 $
+.Dd $Mdocdate: March 23 2018 $
 .Dt BIO_GET_DATA 3
 .Os
 .Sh NAME
@@ -171,4 +171,6 @@ or with
 .Xr BIO_new 3 ,
 .Xr BIO_set_close 3
 .Sh HISTORY
-These functions first appeared in OpenSSL 1.1.0.
+These functions first appeared in OpenSSL 1.1.0
+and have been available since
+.Ox 6.3 .
diff --git a/src/lib/libcrypto/man/BIO_meth_new.3 b/src/lib/libcrypto/man/BIO_meth_new.3
index 813b6bce4b..75d5ff23db 100644
--- a/src/lib/libcrypto/man/BIO_meth_new.3
+++ b/src/lib/libcrypto/man/BIO_meth_new.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: BIO_meth_new.3,v 1.3 2018/02/23 19:12:09 schwarze Exp $
+.\" $OpenBSD: BIO_meth_new.3,v 1.4 2018/03/23 23:18:17 schwarze Exp $
 .\" full merge up to: OpenSSL 99d63d46 Oct 26 13:56:48 2016 -0400
 .\" selective merge up to: OpenSSL 61f805c1 Jan 16 01:01:46 2018 +0800
 .\"
@@ -66,7 +66,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: February 23 2018 $
+.Dd $Mdocdate: March 23 2018 $
 .Dt BIO_METH_NEW 3
 .Os
 .Sh NAME
@@ -362,4 +362,6 @@ functions return function pointers.
 .Xr BIO_new 3 ,
 .Xr BIO_read 3
 .Sh HISTORY
-These functions first appeared in OpenSSL 1.1.0.
+These functions first appeared in OpenSSL 1.1.0
+and have been available since
+.Ox 6.3 .
diff --git a/src/lib/libcrypto/man/BIO_new.3 b/src/lib/libcrypto/man/BIO_new.3
index e25586ff15..36acc3d9fe 100644
--- a/src/lib/libcrypto/man/BIO_new.3
+++ b/src/lib/libcrypto/man/BIO_new.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: BIO_new.3,v 1.13 2018/03/22 17:11:04 schwarze Exp $
+.\" $OpenBSD: BIO_new.3,v 1.14 2018/03/23 23:18:17 schwarze Exp $
 .\" full merge up to:
 .\" OpenSSL man3/BIO_new.pod fb46be03 Feb 26 11:51:31 2016 +0000
 .\" OpenSSL man7/bio.pod 631c37be Dec 12 16:56:50 2017 +0100
@@ -52,7 +52,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: March 22 2018 $
+.Dd $Mdocdate: March 23 2018 $
 .Dt BIO_NEW 3
 .Os
 .Sh NAME
@@ -266,3 +266,7 @@ All these functions have been available since
 .Fn BIO_vfree
 first appeared in OpenSSL 0.9.6 and has been available since
 .Ox 2.9 .
+.Pp
+.Fn BIO_up_ref
+first appeared in OpenSSL 1.1.0 and has been available since
+.Ox 6.3 .
diff --git a/src/lib/libcrypto/man/BN_BLINDING_new.3 b/src/lib/libcrypto/man/BN_BLINDING_new.3
index 6055e676b4..04c5cfa351 100644
--- a/src/lib/libcrypto/man/BN_BLINDING_new.3
+++ b/src/lib/libcrypto/man/BN_BLINDING_new.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: BN_BLINDING_new.3,v 1.9 2018/03/23 04:34:23 schwarze Exp $
+.\"     $OpenBSD: BN_BLINDING_new.3,v 1.10 2018/03/23 23:18:17 schwarze Exp $
 .\"     OpenSSL a528d4f0 Oct 27 13:40:11 2015 -0400
 .\"
 .\" This file was written by Nils Larsch <nils@openssl.org>.
@@ -313,12 +313,6 @@ and
 first appeared in SSLeay 0.9.0 and have been available since
 .Ox 2.4 .
 .Pp
-.Fn BN_BLINDING_thread_id
-was first introduced in OpenSSL 1.0.0, and it deprecates
-.Fn BN_BLINDING_set_thread_id
-and
-.Fn BN_BLINDING_get_thread_id .
-.Pp
 .Fn BN_BLINDING_convert_ex ,
 .Fn BN_BLINDIND_invert_ex ,
 .Fn BN_BLINDING_get_thread_id ,
diff --git a/src/lib/libcrypto/man/BN_bn2bin.3 b/src/lib/libcrypto/man/BN_bn2bin.3
index a94a8b82e1..a12a33e301 100644
--- a/src/lib/libcrypto/man/BN_bn2bin.3
+++ b/src/lib/libcrypto/man/BN_bn2bin.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: BN_bn2bin.3,v 1.9 2018/03/23 04:34:23 schwarze Exp $
+.\"     $OpenBSD: BN_bn2bin.3,v 1.10 2018/03/23 23:18:17 schwarze Exp $
 .\"     OpenSSL a528d4f0 Oct 27 13:40:11 2015 -0400
 .\"
 .\" This file was written by Ulf Moeller <ulf@openssl.org>.
@@ -316,6 +316,6 @@ first appeared in SSLeay 0.9.0.
 All these functions have been available since
 .Ox 2.4 .
 .Pp
-.Fn BN_bn2bin
+.Fn BN_asc2bin
 first appeared in OpenSSL 1.0.0 and has been available since
 .Ox 4.9 .
diff --git a/src/lib/libcrypto/man/BN_generate_prime.3 b/src/lib/libcrypto/man/BN_generate_prime.3
index 768a7eb76a..9dc922cd8a 100644
--- a/src/lib/libcrypto/man/BN_generate_prime.3
+++ b/src/lib/libcrypto/man/BN_generate_prime.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: BN_generate_prime.3,v 1.12 2018/03/23 00:09:11 schwarze Exp $
+.\" $OpenBSD: BN_generate_prime.3,v 1.13 2018/03/23 23:18:17 schwarze Exp $
 .\" full merge up to: OpenSSL b3696a55 Sep 2 09:35:50 2017 -0400
 .\"
 .\" This file was written by Ulf Moeller <ulf@openssl.org>
@@ -399,6 +399,7 @@ first appeared in OpenSSL 0.9.5 and has been available since
 .Fn BN_generate_prime_ex ,
 .Fn BN_is_prime_ex ,
 .Fn BN_is_prime_fasttest_ex ,
+.Fn BN_GENCB_call ,
 .Fn BN_GENCB_set_old ,
 and
 .Fn BN_GENCB_set
@@ -409,4 +410,5 @@ first appeared in OpenSSL 0.9.8 and have been available since
 .Fn BN_GENCB_free ,
 and
 .Fn BN_GENCB_get_arg
-were added in OpenSSL 1.1.0 .
+first appeared in OpenSSL 1.1.0 and have been available since
+.Ox 6.3 .
diff --git a/src/lib/libcrypto/man/BN_mod_mul_montgomery.3 b/src/lib/libcrypto/man/BN_mod_mul_montgomery.3
index 9f33fe0fda..4f898fef16 100644
--- a/src/lib/libcrypto/man/BN_mod_mul_montgomery.3
+++ b/src/lib/libcrypto/man/BN_mod_mul_montgomery.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: BN_mod_mul_montgomery.3,v 1.9 2018/03/21 09:03:49 schwarze Exp $
+.\"     $OpenBSD: BN_mod_mul_montgomery.3,v 1.10 2018/03/23 23:18:17 schwarze Exp $
 .\"     OpenSSL 6859cf74 Sep 25 13:33:28 2002 +0000
 .\"
 .\" This file was written by Ulf Moeller <ulf@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: March 21 2018 $
+.Dd $Mdocdate: March 23 2018 $
 .Dt BN_MOD_MUL_MONTGOMERY 3
 .Os
 .Sh NAME
@@ -231,7 +231,7 @@ appeared before SSLeay 0.8 and have been available since
 .Fn BN_MONT_CTX_init
 and
 .Fn BN_MONT_CTX_copy
-first appeared in SSLeay 0.9.1 and
+first appeared in SSLeay 0.9.1 and have been available since
 .Ox 2.6 .
 .Sh CAVEATS
 .Fn BN_MONT_CTX_init
diff --git a/src/lib/libcrypto/man/DH_generate_parameters.3 b/src/lib/libcrypto/man/DH_generate_parameters.3
index c3b7edfd33..477f65d01c 100644
--- a/src/lib/libcrypto/man/DH_generate_parameters.3
+++ b/src/lib/libcrypto/man/DH_generate_parameters.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: DH_generate_parameters.3,v 1.9 2018/03/20 22:22:10 schwarze Exp $
+.\"     $OpenBSD: DH_generate_parameters.3,v 1.10 2018/03/23 23:18:17 schwarze Exp $
 .\"     OpenSSL 05ea606a May 20 20:52:46 2016 -0400
 .\"
 .\" This file was written by Ulf Moeller <ulf@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: March 20 2018 $
+.Dd $Mdocdate: March 23 2018 $
 .Dt DH_GENERATE_PARAMETERS 3
 .Os
 .Sh NAME
@@ -167,6 +167,10 @@ In versions before OpenSSL 0.9.5,
 .Dv DH_CHECK_P_NOT_STRONG_PRIME
 is used instead of
 .Dv DH_CHECK_P_NOT_SAFE_PRIME .
+.Pp
+.Fn DH_generate_parameters_ex
+first appeared in OpenSSL 0.9.8 and has been available since
+.Ox 4.5 .
 .Sh CAVEATS
 .Fn DH_generate_parameters_ex
 and
diff --git a/src/lib/libcrypto/man/DH_get0_pqg.3 b/src/lib/libcrypto/man/DH_get0_pqg.3
index 5fa2eeb44f..cff96243b2 100644
--- a/src/lib/libcrypto/man/DH_get0_pqg.3
+++ b/src/lib/libcrypto/man/DH_get0_pqg.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: DH_get0_pqg.3,v 1.3 2018/02/23 14:50:21 schwarze Exp $
+.\" $OpenBSD: DH_get0_pqg.3,v 1.4 2018/03/23 23:18:17 schwarze Exp $
 .\" selective merge up to: OpenSSL 7966101e Sep 18 11:58:24 2017 -0400
 .\"
 .\" This file was written by Matt Caswell <matt@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: February 23 2018 $
+.Dd $Mdocdate: March 23 2018 $
 .Dt DH_GET0_PQG 3
 .Os
 .Sh NAME
@@ -253,4 +253,6 @@ if no engine was set for this object.
 .Xr DH_size 3 ,
 .Xr DHparams_print 3
 .Sh HISTORY
-These functions first appeared in OpenSSL 1.1.0.
+These functions first appeared in OpenSSL 1.1.0
+and have been available since
+.Ox 6.3 .
diff --git a/src/lib/libcrypto/man/DH_get_ex_new_index.3 b/src/lib/libcrypto/man/DH_get_ex_new_index.3
index 7f3f0e7765..81a0aff8ec 100644
--- a/src/lib/libcrypto/man/DH_get_ex_new_index.3
+++ b/src/lib/libcrypto/man/DH_get_ex_new_index.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: DH_get_ex_new_index.3,v 1.4 2016/12/10 22:22:59 schwarze Exp $
+.\"     $OpenBSD: DH_get_ex_new_index.3,v 1.5 2018/03/23 23:18:17 schwarze Exp $
 .\"     OpenSSL a528d4f0 Oct 27 13:40:11 2015 -0400
 .\"
 .\" This file was written by Ulf Moeller <ulf@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: December 10 2016 $
+.Dd $Mdocdate: March 23 2018 $
 .Dt DH_GET_EX_NEW_INDEX 3
 .Os
 .Sh NAME
@@ -94,4 +94,6 @@ and
 .Fn DH_set_ex_data ,
 and
 .Fn DH_get_ex_data
-are available since OpenSSL 0.9.5.
+first appeared in OpenSSL 0.9.5
+and have been available since
+.Ox 2.7 .
diff --git a/src/lib/libcrypto/man/DH_size.3 b/src/lib/libcrypto/man/DH_size.3
index 5a21fc96ee..24ca50f8a5 100644
--- a/src/lib/libcrypto/man/DH_size.3
+++ b/src/lib/libcrypto/man/DH_size.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: DH_size.3,v 1.7 2018/03/20 22:22:10 schwarze Exp $
+.\" $OpenBSD: DH_size.3,v 1.8 2018/03/23 23:18:17 schwarze Exp $
 .\" full merge up to: OpenSSL b97fdb57 Nov 11 09:33:09 2016 +0100
 .\"
 .\" This file was written by Ulf Moeller <ulf@openssl.org>
@@ -49,7 +49,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: March 20 2018 $
+.Dd $Mdocdate: March 23 2018 $
 .Dt DH_SIZE 3
 .Os
 .Sh NAME
@@ -92,4 +92,5 @@ appeared in SSLeay 0.8.1b or earlier and has been available since
 .Ox 2.4 .
 .Pp
 .Fn DH_bits
-first appeared in OpenSSL 1.1.0.
+first appeared in OpenSSL 1.1.0 and has been available since
+.Ox 6.3 .
diff --git a/src/lib/libcrypto/man/DSA_SIG_new.3 b/src/lib/libcrypto/man/DSA_SIG_new.3
index 676eb99052..33f2586bc4 100644
--- a/src/lib/libcrypto/man/DSA_SIG_new.3
+++ b/src/lib/libcrypto/man/DSA_SIG_new.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: DSA_SIG_new.3,v 1.6 2018/03/21 17:57:48 schwarze Exp $
+.\" $OpenBSD: DSA_SIG_new.3,v 1.7 2018/03/23 23:18:17 schwarze Exp $
 .\" full merge up to: OpenSSL b97fdb57 Nov 11 09:33:09 2016 +0100
 .\"
 .\" This file was written by Ulf Moeller <ulf@openssl.org>,
@@ -50,7 +50,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: March 21 2018 $
+.Dd $Mdocdate: March 23 2018 $
 .Dt DSA_SIG_NEW 3
 .Os
 .Sh NAME
@@ -132,5 +132,11 @@ returns 1 on success or 0 on failure.
 .Fn DSA_SIG_new
 and
 .Fn DSA_SIG_free
-first appeared in in OpenSSL 0.9.3 and have been available since
+first appeared in OpenSSL 0.9.3 and have been available since
 .Ox 2.6 .
+.Pp
+.Fn DSA_SIG_get0
+and
+.Fn DSA_SIG_set0
+first appeared in OpenSSL 1.1.0 and have been available since
+.Ox 6.3 .
diff --git a/src/lib/libcrypto/man/DSA_get0_pqg.3 b/src/lib/libcrypto/man/DSA_get0_pqg.3
index cff2b5cc41..56d57066be 100644
--- a/src/lib/libcrypto/man/DSA_get0_pqg.3
+++ b/src/lib/libcrypto/man/DSA_get0_pqg.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: DSA_get0_pqg.3,v 1.3 2018/02/24 13:25:50 schwarze Exp $
+.\" $OpenBSD: DSA_get0_pqg.3,v 1.4 2018/03/23 23:18:17 schwarze Exp $
 .\" full merge up to: OpenSSL e90fc053 Jul 15 09:39:45 2017 -0400
 .\"
 .\" This file was written by Matt Caswell <matt@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: February 24 2018 $
+.Dd $Mdocdate: March 23 2018 $
 .Dt DSA_GET0_PQG 3
 .Os
 .Sh NAME
@@ -247,4 +247,6 @@ if no engine was set for this object.
 .Xr DSA_sign 3 ,
 .Xr DSA_size 3
 .Sh HISTORY
-These functions first appeared in OpenSSL 1.1.0.
+These functions first appeared in OpenSSL 1.1.0
+and have been available since
+.Ox 6.3 .
diff --git a/src/lib/libcrypto/man/ECDSA_SIG_new.3 b/src/lib/libcrypto/man/ECDSA_SIG_new.3
index d462e1f949..7a6fa4fa78 100644
--- a/src/lib/libcrypto/man/ECDSA_SIG_new.3
+++ b/src/lib/libcrypto/man/ECDSA_SIG_new.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ECDSA_SIG_new.3,v 1.10 2018/03/23 00:09:11 schwarze Exp $
+.\" $OpenBSD: ECDSA_SIG_new.3,v 1.11 2018/03/23 23:18:17 schwarze Exp $
 .\" full merge up to: OpenSSL e9b77246 Jan 20 19:58:49 2017 +0100
 .\"
 .\" This file was written by Nils Larsch <nils@openssl.org>.
@@ -502,6 +502,12 @@ and
 .Fn ECDSA_set_method
 first appeared in OpenSSL 0.9.8 and have been available since
 .Ox 4.5 .
+.Pp
+.Fn ECDSA_SIG_get0
+and
+.Fn ECDSA_SIG_set0
+first appeared in OpenSSL 1.1.0 and have been available since
+.Ox 6.3 .
 .Sh AUTHORS
 .An Nils Larsch
 for the OpenSSL project.
diff --git a/src/lib/libcrypto/man/EC_GROUP_copy.3 b/src/lib/libcrypto/man/EC_GROUP_copy.3
index 5164d6ddea..bdbd72c2cc 100644
--- a/src/lib/libcrypto/man/EC_GROUP_copy.3
+++ b/src/lib/libcrypto/man/EC_GROUP_copy.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: EC_GROUP_copy.3,v 1.9 2018/03/23 00:09:11 schwarze Exp $
+.\"     $OpenBSD: EC_GROUP_copy.3,v 1.10 2018/03/23 23:18:17 schwarze Exp $
 .\"     OpenSSL aafbe1cc Jun 12 23:42:08 2013 +0100
 .\"
 .\" This file was written by Matt Caswell <matt@openssl.org>.
@@ -497,10 +497,6 @@ first appeared in OpenSSL 0.9.7 and have been available since
 .Ox 3.2 .
 .Pp
 .Fn EC_GROUP_dup ,
-.Fn EC_GROUP_set_generator ,
-.Fn EC_GROUP_get0_generator ,
-.Fn EC_GROUP_get_order ,
-.Fn EC_GROUP_get_cofactor ,
 .Fn EC_GROUP_set_curve_name ,
 .Fn EC_GROUP_get_curve_name ,
 .Fn EC_GROUP_set_asn1_flag ,
diff --git a/src/lib/libcrypto/man/EC_KEY_new.3 b/src/lib/libcrypto/man/EC_KEY_new.3
index 06a85aaed1..c77233b4ee 100644
--- a/src/lib/libcrypto/man/EC_KEY_new.3
+++ b/src/lib/libcrypto/man/EC_KEY_new.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: EC_KEY_new.3,v 1.12 2018/03/23 05:48:56 schwarze Exp $
+.\"     $OpenBSD: EC_KEY_new.3,v 1.13 2018/03/23 23:18:17 schwarze Exp $
 .\"     OpenSSL d900a015 Oct 8 14:40:42 2015 +0200
 .\"
 .\" This file was written by Matt Caswell <matt@openssl.org>.
@@ -549,15 +549,12 @@ returns the point_conversion_form for the
 .Fn EC_KEY_precompute_mult ,
 .Fn EC_KEY_generate_key ,
 .Fn EC_KEY_check_key ,
+.Fn EC_KEY_print ,
 and
 .Fn EC_KEY_print_fp
 first appeared in OpenSSL 0.9.8 and have been available since
 .Ox 4.5 .
 .Pp
-.Fn EC_KEY_up_ref
-first appeared in OpenSSL 1.0.0 and has been available since
-.Ox 4.9 .
-.Pp
 .Fn EC_KEY_get_flags ,
 .Fn EC_KEY_set_flags ,
 .Fn EC_KEY_clear_flags ,
diff --git a/src/lib/libcrypto/man/ERR_error_string.3 b/src/lib/libcrypto/man/ERR_error_string.3
index b303ab2a31..1587be1bbd 100644
--- a/src/lib/libcrypto/man/ERR_error_string.3
+++ b/src/lib/libcrypto/man/ERR_error_string.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: ERR_error_string.3,v 1.5 2018/03/20 22:56:38 schwarze Exp $
+.\"     $OpenBSD: ERR_error_string.3,v 1.6 2018/03/23 23:18:17 schwarze Exp $
 .\"     OpenSSL b97fdb57 Nov 11 09:33:09 2016 +0100
 .\"
 .\" This file was written by Ulf Moeller <ulf@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: March 20 2018 $
+.Dd $Mdocdate: March 23 2018 $
 .Dt ERR_ERROR_STRING 3
 .Os
 .Sh NAME
@@ -172,4 +172,5 @@ appeared in SSLeay 0.8.1b or earlier and have been available since
 .Ox 2.4 .
 .Pp
 .Fn ERR_error_string_n
-was added in OpenSSL 0.9.6.
+first appeared in OpenSSL 0.9.6 and has been available since
+.Ox 2.9 .
diff --git a/src/lib/libcrypto/man/EVP_DigestInit.3 b/src/lib/libcrypto/man/EVP_DigestInit.3
index 8268a48102..98a06183d3 100644
--- a/src/lib/libcrypto/man/EVP_DigestInit.3
+++ b/src/lib/libcrypto/man/EVP_DigestInit.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: EVP_DigestInit.3,v 1.13 2018/03/22 21:08:22 schwarze Exp $
+.\" $OpenBSD: EVP_DigestInit.3,v 1.14 2018/03/23 23:18:17 schwarze Exp $
 .\" full merge up to: OpenSSL 7f572e95 Dec 2 13:57:04 2015 +0000
 .\" selective merge up to: OpenSSL a95d7574 Jul 2 12:16:38 2017 -0400
 .\"
@@ -51,7 +51,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: March 22 2018 $
+.Dd $Mdocdate: March 23 2018 $
 .Dt EVP_DIGESTINIT 3
 .Os
 .Sh NAME
@@ -668,10 +668,25 @@ and
 first appeared in OpenSSL 0.9.7 and have been available since
 .Ox 3.2 .
 .Pp
-.Fn EVP_MD_CTX_new
+.Fn EVP_sha224 ,
+.Fn EVP_sha256 ,
+.Fn EVP_sha384 ,
 and
-.Fn EVP_MD_CTX_free
-first appeared in OpenSSL 1.1.0.
+.Fn EVP_sha512
+first appeared in OpenSSL 0.8.7h and have been available since
+.Ox 4.0 .
+.Pp
+.Fn EVP_MD_CTX_ctrl
+first appeared in OpenSSL 1.1.0 and has been available since
+.Ox 5.7 .
+.Pp
+.Fn EVP_MD_CTX_new ,
+.Fn EVP_MD_CTX_reset ,
+.Fn EVP_MD_CTX_free ,
+and
+.Fn EVP_md5_sha1
+first appeared in OpenSSL 1.1.0 and have been available since
+.Ox 6.3 .
 .Pp
 The link between digests and signing algorithms was fixed in OpenSSL 1.0
 and later, so now
diff --git a/src/lib/libcrypto/man/EVP_EncryptInit.3 b/src/lib/libcrypto/man/EVP_EncryptInit.3
index 752c5a5316..775b9c4214 100644
--- a/src/lib/libcrypto/man/EVP_EncryptInit.3
+++ b/src/lib/libcrypto/man/EVP_EncryptInit.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: EVP_EncryptInit.3,v 1.18 2018/03/23 05:48:56 schwarze Exp $
+.\" $OpenBSD: EVP_EncryptInit.3,v 1.19 2018/03/23 23:18:17 schwarze Exp $
 .\" full merge up to: OpenSSL 5211e094 Nov 11 14:39:11 2014 -0800
 .\" selective merge up to: OpenSSL 5c5eb286 Dec 5 00:36:43 2017 +0100
 .\"
@@ -1316,7 +1316,8 @@ first appeared in OpenSSL 1.0.1 and have been available since
 .Ox 5.3 .
 .Pp
 .Fn EVP_CIPHER_CTX_reset
-first appeared in OpenSSL 1.1.0.
+first appeared in OpenSSL 1.1.0 and has been available since
+.Ox 6.3 .
 .Sh BUGS
 .Dv EVP_MAX_KEY_LENGTH
 and
diff --git a/src/lib/libcrypto/man/EVP_PKEY_CTX_ctrl.3 b/src/lib/libcrypto/man/EVP_PKEY_CTX_ctrl.3
index b1af6c6eac..8462da6d46 100644
--- a/src/lib/libcrypto/man/EVP_PKEY_CTX_ctrl.3
+++ b/src/lib/libcrypto/man/EVP_PKEY_CTX_ctrl.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: EVP_PKEY_CTX_ctrl.3,v 1.10 2018/03/23 04:34:23 schwarze Exp $
+.\"     $OpenBSD: EVP_PKEY_CTX_ctrl.3,v 1.11 2018/03/23 23:18:17 schwarze Exp $
 .\"     OpenSSL EVP_PKEY_CTX_ctrl.pod 1722496f Jun 8 15:18:38 2017 -0400
 .\"     OpenSSL EVP_PKEY_CTX_ctrl.pod e03af178 Dec 11 17:05:57 2014 -0500
 .\"
@@ -289,16 +289,6 @@ supported by the public key algorithm.
 .Xr EVP_PKEY_verify 3 ,
 .Xr EVP_PKEY_verify_recover 3
 .Sh HISTORY
-.Fn EVP_PKEY_CTX_ctrl ,
-.Fn EVP_PKEY_CTX_ctrl_str ,
-.Fn EVP_PKEY_CTX_set_rsa_padding ,
-.Fn EVP_PKEY_CTX_set_rsa_pss_saltlen ,
-.Fn EVP_PKEY_CTX_set_rsa_keygen_bits ,
-.Fn EVP_PKEY_CTX_set_rsa_keygen_pubexp ,
-.Fn EVP_PKEY_CTX_set_dsa_paramgen_bits ,
-.Fn EVP_PKEY_CTX_set_dh_paramgen_prime_len ,
-.Fn EVP_PKEY_CTX_set_dh_paramgen_generator ,
-and
-.Fn EVP_PKEY_CTX_set_ec_paramgen_curve_nid
-first appeared in OpenSSL 1.0.0 and have been available since
+These functions first appeared in OpenSSL 1.0.0
+and have been available since
 .Ox 4.9 .
diff --git a/src/lib/libcrypto/man/EVP_PKEY_new.3 b/src/lib/libcrypto/man/EVP_PKEY_new.3
index 69168cb70f..ed286ecb31 100644
--- a/src/lib/libcrypto/man/EVP_PKEY_new.3
+++ b/src/lib/libcrypto/man/EVP_PKEY_new.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: EVP_PKEY_new.3,v 1.6 2018/03/20 23:56:07 schwarze Exp $
+.\" $OpenBSD: EVP_PKEY_new.3,v 1.7 2018/03/23 23:18:17 schwarze Exp $
 .\" full merge up to: OpenSSL 99d63d42 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: March 20 2018 $
+.Dd $Mdocdate: March 23 2018 $
 .Dt EVP_PKEY_NEW 3
 .Os
 .Sh NAME
@@ -118,4 +118,5 @@ appeared in SSLeay 0.8.1b or earlier and have been available since
 .Ox 2.4 .
 .Pp
 .Fn EVP_PKEY_up_ref
-first appeared in OpenSSL 1.1.0.
+first appeared in OpenSSL 1.1.0 and has been available since
+.Ox 6.3 .
diff --git a/src/lib/libcrypto/man/EVP_PKEY_set1_RSA.3 b/src/lib/libcrypto/man/EVP_PKEY_set1_RSA.3
index 0b928e2833..6682ea5154 100644
--- a/src/lib/libcrypto/man/EVP_PKEY_set1_RSA.3
+++ b/src/lib/libcrypto/man/EVP_PKEY_set1_RSA.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: EVP_PKEY_set1_RSA.3,v 1.11 2018/03/23 04:34:23 schwarze Exp $
+.\" $OpenBSD: EVP_PKEY_set1_RSA.3,v 1.12 2018/03/23 23:18:17 schwarze Exp $
 .\" full merge up to: OpenSSL bb9ad09e Jun 6 00:43:05 2016 -0400
 .\" selective merge up to: OpenSSL 99d63d46 Oct 26 13:56:48 2016 -0400
 .\"
@@ -327,3 +327,11 @@ and
 .Fn EVP_PKEY_base_id
 first appeared in OpenSSL 1.0.0 and have been available since
 .Ox 4.9 .
+.Pp
+.Fn EVP_PKEY_get0_RSA ,
+.Fn EVP_PKEY_get0_DSA ,
+.Fn EVP_PKEY_get0_DH ,
+and
+.Fn EVP_PKEY_get0_EC_KEY
+first appeared in OpenSSL 1.1.0 and have been available since
+.Ox 6.3 .
diff --git a/src/lib/libcrypto/man/HMAC.3 b/src/lib/libcrypto/man/HMAC.3
index 85638caf16..1f855dc17d 100644
--- a/src/lib/libcrypto/man/HMAC.3
+++ b/src/lib/libcrypto/man/HMAC.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: HMAC.3,v 1.12 2018/03/23 04:34:23 schwarze Exp $
+.\" $OpenBSD: HMAC.3,v 1.13 2018/03/23 23:18:17 schwarze Exp $
 .\" full merge up to: OpenSSL crypto/hmac a528d4f0 Oct 27 13:40:11 2015 -0400
 .\" selective merge up to: OpenSSL man3/HMAC b3696a55 Sep 2 09:35:50 2017 -0400
 .\"
@@ -399,4 +399,5 @@ first appeared in OpenSSL 1.0.0 and has been available since
 .Fn HMAC_CTX_free ,
 and
 .Fn HMAC_CTX_get_md
-first appeared in OpenSSL 1.1.0.
+first appeared in OpenSSL 1.1.0 and have been available since
+.Ox 6.3 .
diff --git a/src/lib/libcrypto/man/OCSP_resp_find_status.3 b/src/lib/libcrypto/man/OCSP_resp_find_status.3
index 6d58bebdb9..1c4da4e99e 100644
--- a/src/lib/libcrypto/man/OCSP_resp_find_status.3
+++ b/src/lib/libcrypto/man/OCSP_resp_find_status.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: OCSP_resp_find_status.3,v 1.7 2018/03/22 21:08:22 schwarze Exp $
+.\" $OpenBSD: OCSP_resp_find_status.3,v 1.8 2018/03/23 23:18:17 schwarze Exp $
 .\" full merge up to: OpenSSL c952780c Jun 21 07:03:34 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: March 22 2018 $
+.Dd $Mdocdate: March 23 2018 $
 .Dt OCSP_RESP_FIND_STATUS 3
 .Os
 .Sh NAME
@@ -402,3 +402,7 @@ and
 .Fn OCSP_check_validity
 first appeared in OpenSSL 0.9.7 and have been available since
 .Ox 3.2 .
+.Pp
+.Fn OCSP_SINGLERESP_get0_id
+first appeared in OpenSSL 1.1.0 and has been available since
+.Ox 6.3 .
diff --git a/src/lib/libcrypto/man/OPENSSL_VERSION_NUMBER.3 b/src/lib/libcrypto/man/OPENSSL_VERSION_NUMBER.3
index 3c3da3cb28..46f8083ab3 100644
--- a/src/lib/libcrypto/man/OPENSSL_VERSION_NUMBER.3
+++ b/src/lib/libcrypto/man/OPENSSL_VERSION_NUMBER.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: OPENSSL_VERSION_NUMBER.3,v 1.8 2018/03/21 14:55:30 schwarze Exp $
+.\" $OpenBSD: OPENSSL_VERSION_NUMBER.3,v 1.9 2018/03/23 23:18:17 schwarze Exp $
 .\" full merge up to: OpenSSL 1f13ad31 Dec 25 17:50:39 2017 +0800
 .\"
 .\" This file is a derived work.
@@ -68,7 +68,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: March 21 2018 $
+.Dd $Mdocdate: March 23 2018 $
 .Dt OPENSSL_VERSION_NUMBER 3
 .Os
 .Sh NAME
@@ -267,3 +267,10 @@ and got its final format in LibreSSL 2.3.2 and
 .Dv LIBRESSL_VERSION_TEXT
 first appeared in LibreSSL 2.2.2 and
 .Ox 5.8 .
+.Pp
+.Fn OpenSSL_version_num
+and
+.Fn OpenSSL_version
+first appeared in OpenSSL 1.1.0
+and have been available since LibreSSL 2.7.1 and
+.Ox 6.3 .
diff --git a/src/lib/libcrypto/man/OPENSSL_init_crypto.3 b/src/lib/libcrypto/man/OPENSSL_init_crypto.3
index 525d748cea..3a532550ae 100644
--- a/src/lib/libcrypto/man/OPENSSL_init_crypto.3
+++ b/src/lib/libcrypto/man/OPENSSL_init_crypto.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: OPENSSL_init_crypto.3,v 1.2 2018/03/21 22:08:04 schwarze Exp $
+.\" $OpenBSD: OPENSSL_init_crypto.3,v 1.3 2018/03/23 23:18:17 schwarze Exp $
 .\" Copyright (c) 2018 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: March 21 2018 $
+.Dd $Mdocdate: March 23 2018 $
 .Dt OPENSSL_INIT_CRYPTO 3
 .Os
 .Sh NAME
@@ -74,7 +74,8 @@ is intended to return 1 on success or 0 on error.
 .Xr openssl.cnf 5
 .Sh HISTORY
 .Fn OPENSSL_init_crypto
-first appeared in OpenSSL 1.1.0.
+first appeared in OpenSSL 1.1.0 and has been available since
+.Ox 6.3 .
 .Sh BUGS
 .Fn OPENSSL_init_crypto
 silently ignores almost all kinds of errors.
diff --git a/src/lib/libcrypto/man/PKCS7_encrypt.3 b/src/lib/libcrypto/man/PKCS7_encrypt.3
index 324cb545d7..a8717d3104 100644
--- a/src/lib/libcrypto/man/PKCS7_encrypt.3
+++ b/src/lib/libcrypto/man/PKCS7_encrypt.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: PKCS7_encrypt.3,v 1.7 2018/03/22 16:06:33 schwarze Exp $
+.\"     $OpenBSD: PKCS7_encrypt.3,v 1.8 2018/03/23 23:18:17 schwarze Exp $
 .\"     OpenSSL 99d63d46 Oct 26 13:56:48 2016 -0400
 .\"
 .\" This file was written by Dr. Stephen Henson <steve@openssl.org>.
@@ -49,7 +49,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: March 22 2018 $
+.Dd $Mdocdate: March 23 2018 $
 .Dt PKCS7_ENCRYPT 3
 .Os
 .Sh NAME
@@ -158,7 +158,7 @@ The error can be obtained from
 .Xr PKCS7_decrypt 3 ,
 .Xr PKCS7_new 3
 .Sh HISTORY
-.Xr PKCS7_decrypt 3
+.Fn PKCS7_encrypt
 first appeared in OpenSSL 0.9.5 and has been available since
 .Ox 2.7 .
 .Pp
diff --git a/src/lib/libcrypto/man/RAND_add.3 b/src/lib/libcrypto/man/RAND_add.3
index a8088c53cd..7fd955dde6 100644
--- a/src/lib/libcrypto/man/RAND_add.3
+++ b/src/lib/libcrypto/man/RAND_add.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: RAND_add.3,v 1.8 2018/03/22 16:06:33 schwarze Exp $
+.\" $OpenBSD: RAND_add.3,v 1.9 2018/03/23 23:18:17 schwarze Exp $
 .\" content checked up to: OpenSSL c16de9d8 Aug 31 23:16:22 2017 +0200
 .\"
 .\" Copyright (c) 2014 Miod Vallat <miod@openbsd.org>
@@ -15,7 +15,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: March 22 2018 $
+.Dd $Mdocdate: March 23 2018 $
 .Dt RAND_ADD 3
 .Os
 .Sh NAME
@@ -67,3 +67,7 @@ and
 .Fn RAND_status
 first appeared in OpenSSL 0.9.5 and have been available since
 .Ox 2.7 .
+.Pp
+.Fn RAND_poll
+first appeared in OpenSSL 0.9.6 and has been available since
+.Ox 2.9 .
diff --git a/src/lib/libcrypto/man/RSA_get0_key.3 b/src/lib/libcrypto/man/RSA_get0_key.3
index f82534864f..3e6f75a906 100644
--- a/src/lib/libcrypto/man/RSA_get0_key.3
+++ b/src/lib/libcrypto/man/RSA_get0_key.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: RSA_get0_key.3,v 1.3 2018/02/24 13:04:47 schwarze Exp $
+.\" $OpenBSD: RSA_get0_key.3,v 1.4 2018/03/23 23:18:17 schwarze Exp $
 .\" selective merge up to: OpenSSL 665d899f Aug 2 02:19:43 2017 +0800
 .\"
 .\" This file was written by Richard Levitte <levitte@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: February 24 2018 $
+.Dd $Mdocdate: March 23 2018 $
 .Dt RSA_GET0_KEY 3
 .Os
 .Sh NAME
@@ -285,4 +285,6 @@ are set.
 .Xr RSA_print 3 ,
 .Xr RSA_size 3
 .Sh HISTORY
-These functions first appeared in OpenSSL 1.1.0.
+These functions first appeared in OpenSSL 1.1.0
+and have been available since
+.Ox 6.3 .
diff --git a/src/lib/libcrypto/man/RSA_get_ex_new_index.3 b/src/lib/libcrypto/man/RSA_get_ex_new_index.3
index dee079b3db..cf3d3f6fd7 100644
--- a/src/lib/libcrypto/man/RSA_get_ex_new_index.3
+++ b/src/lib/libcrypto/man/RSA_get_ex_new_index.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: RSA_get_ex_new_index.3,v 1.9 2018/03/21 07:25:59 schwarze Exp $
+.\"     $OpenBSD: RSA_get_ex_new_index.3,v 1.10 2018/03/23 23:18:17 schwarze Exp $
 .\"     OpenSSL 35cb565a Nov 19 15:49:30 2015 -0500
 .\"
 .\" This file was written by Ulf Moeller <ulf@openssl.org> and
@@ -49,7 +49,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: March 21 2018 $
+.Dd $Mdocdate: March 23 2018 $
 .Dt RSA_GET_EX_NEW_INDEX 3
 .Os
 .Sh NAME
@@ -81,6 +81,7 @@
 .Fa "RSA *r"
 .Fa "int idx"
 .Fc
+.In openssl/crypto.h
 .Ft typedef int
 .Fo CRYPTO_EX_new
 .Fa "void *parent"
@@ -271,11 +272,8 @@ On failure an error code can be obtained from
 .Xr X509_STORE_CTX_set_ex_data 3 ,
 .Xr X509_STORE_set_ex_data 3
 .Sh HISTORY
-.Fn RSA_get_ex_new_index ,
-.Fn RSA_set_ex_data ,
-and
-.Fn RSA_get_ex_data
-first appeared in SSLeay 0.9.0 and have been available since
+These functions first appeared in SSLeay 0.9.0
+and have been available since
 .Ox 2.4 .
 .Sh BUGS
 .Fa dup_func
diff --git a/src/lib/libcrypto/man/RSA_size.3 b/src/lib/libcrypto/man/RSA_size.3
index e730be2dc4..f99979bb76 100644
--- a/src/lib/libcrypto/man/RSA_size.3
+++ b/src/lib/libcrypto/man/RSA_size.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: RSA_size.3,v 1.7 2018/03/21 01:27:25 schwarze Exp $
+.\" $OpenBSD: RSA_size.3,v 1.8 2018/03/23 23:18:17 schwarze Exp $
 .\" full merge up to: OpenSSL 99d63d46 Oct 26 13:56:48 2016 -0400
 .\"
 .\" This file was written by Ulf Moeller <ulf@openssl.org> and
@@ -49,7 +49,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: March 21 2018 $
+.Dd $Mdocdate: March 23 2018 $
 .Dt RSA_SIZE 3
 .Os
 .Sh NAME
@@ -88,8 +88,9 @@ The size.
 .Xr RSA_new 3
 .Sh HISTORY
 .Fn RSA_size
-appeared before SSLeay 0.8 and have been available since
+appeared before SSLeay 0.8 and has been available since
 .Ox 2.4 .
 .Pp
 .Fn RSA_bits
-first appeared in OpenSSL 1.1.0.
+first appeared in OpenSSL 1.1.0 and has been available since
+.Ox 6.3 .
diff --git a/src/lib/libcrypto/man/X509V3_get_d2i.3 b/src/lib/libcrypto/man/X509V3_get_d2i.3
index 03af7fbcdd..91883669d8 100644
--- a/src/lib/libcrypto/man/X509V3_get_d2i.3
+++ b/src/lib/libcrypto/man/X509V3_get_d2i.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: X509V3_get_d2i.3,v 1.13 2018/03/22 21:08:22 schwarze Exp $
+.\" $OpenBSD: X509V3_get_d2i.3,v 1.14 2018/03/23 23:18:17 schwarze Exp $
 .\" full merge up to: OpenSSL ff7fbfd5 Nov 2 11:52:01 2015 +0000
 .\" selective merge up to: OpenSSL 99d63d46 Oct 26 13:56:48 2016 -0400
 .\"
@@ -49,7 +49,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: March 22 2018 $
+.Dd $Mdocdate: March 23 2018 $
 .Dt X509V3_GET_D2I 3
 .Os
 .Sh NAME
@@ -428,3 +428,10 @@ and
 .Fn X509_REVOKED_add1_ext_i2d
 first appeared in OpenSSL 0.9.7 and have been available since
 .Ox 3.2 .
+.Pp
+.Fn X509_get0_extensions ,
+.Fn X509_CRL_get0_extensions ,
+and
+.Fn X509_REVOKED_get0_extensions
+first appeared in OpenSSL 1.1.0 and have been available since
+.Ox 6.3 .
diff --git a/src/lib/libcrypto/man/X509_CRL_new.3 b/src/lib/libcrypto/man/X509_CRL_new.3
index b9ecb684c3..2f824bff91 100644
--- a/src/lib/libcrypto/man/X509_CRL_new.3
+++ b/src/lib/libcrypto/man/X509_CRL_new.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: X509_CRL_new.3,v 1.5 2018/03/21 03:16:08 schwarze Exp $
+.\"     $OpenBSD: X509_CRL_new.3,v 1.6 2018/03/23 23:18:17 schwarze Exp $
 .\"
 .\" Copyright (c) 2016, 2018 Ingo Schwarze <schwarze@openbsd.org>
 .\"
@@ -14,7 +14,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: March 21 2018 $
+.Dd $Mdocdate: March 23 2018 $
 .Dt X509_CRL_NEW 3
 .Os
 .Sh NAME
@@ -127,3 +127,7 @@ and
 .Fn X509_CRL_INFO_free
 appeared before SSLeay 0.8 and have been available since
 .Ox 2.4 .
+.Pp
+.Fn X509_CRL_up_ref
+first appeared in OpenSSL 1.1.0 and has been available since
+.Ox 6.3 .
diff --git a/src/lib/libcrypto/man/X509_OBJECT_get0_X509.3 b/src/lib/libcrypto/man/X509_OBJECT_get0_X509.3
index da95d9da15..0119b91e1e 100644
--- a/src/lib/libcrypto/man/X509_OBJECT_get0_X509.3
+++ b/src/lib/libcrypto/man/X509_OBJECT_get0_X509.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: X509_OBJECT_get0_X509.3,v 1.4 2018/03/22 17:11:04 schwarze Exp $
+.\" $OpenBSD: X509_OBJECT_get0_X509.3,v 1.5 2018/03/23 23:18:17 schwarze Exp $
 .\" Copyright (c) 2018 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: March 22 2018 $
+.Dd $Mdocdate: March 23 2018 $
 .Dt X509_OBJECT_GET0_X509 3
 .Os
 .Sh NAME
@@ -228,3 +228,9 @@ and
 .Fn X509_OBJECT_retrieve_match
 first appeared in OpenSSL 0.9.6 and have been available since
 .Ox 2.9 .
+.Pp
+.Fn X509_OBJECT_get0_X509
+and
+.Fn X509_OBJECT_get0_X509_CRL
+first appeared in OpenSSL 1.1.0 and have been available since
+.Ox 6.3 .
diff --git a/src/lib/libcrypto/man/X509_PUBKEY_new.3 b/src/lib/libcrypto/man/X509_PUBKEY_new.3
index 8ef37a7973..077f6f7d0e 100644
--- a/src/lib/libcrypto/man/X509_PUBKEY_new.3
+++ b/src/lib/libcrypto/man/X509_PUBKEY_new.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: X509_PUBKEY_new.3,v 1.11 2018/03/23 04:34:23 schwarze Exp $
+.\" $OpenBSD: X509_PUBKEY_new.3,v 1.12 2018/03/23 23:18:17 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>.
@@ -310,3 +310,7 @@ and
 .Fn X509_PUBKEY_get0_param
 first appeared in OpenSSL 1.0.0 and have been available since
 .Ox 4.9 .
+.Pp
+.Fn X509_PUBKEY_get0
+first appeared in OpenSSL 1.1.0 and has been available since
+.Ox 6.3 .
diff --git a/src/lib/libcrypto/man/X509_REVOKED_new.3 b/src/lib/libcrypto/man/X509_REVOKED_new.3
index b34f49a11f..65d3470b40 100644
--- a/src/lib/libcrypto/man/X509_REVOKED_new.3
+++ b/src/lib/libcrypto/man/X509_REVOKED_new.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: X509_REVOKED_new.3,v 1.7 2018/03/23 14:26:40 schwarze Exp $
+.\" $OpenBSD: X509_REVOKED_new.3,v 1.8 2018/03/23 23:18:17 schwarze Exp $
 .\" full merge up to:
 .\" OpenSSL man3/X509_CRL_get0_by_serial cdd6c8c5 Mar 20 12:29:37 2017 +0100
 .\"
@@ -192,5 +192,10 @@ first appeared in OpenSSL 0.9.7 and have been available since
 .Ox 3.2 .
 .Pp
 .Fn X509_REVOKED_dup
-first appeared in OpenSSL 1.0.2 and has been available since
+first appeared in OpenSSL 1.0.2.
+.Fn X509_REVOKED_get0_serialNumber
+and
+.Fn X509_REVOKED_get0_revocationDate
+first appeared in OpenSSL 1.1.0.
+These functions have been available since
 .Ox 6.3 .
diff --git a/src/lib/libcrypto/man/X509_STORE_CTX_get_error.3 b/src/lib/libcrypto/man/X509_STORE_CTX_get_error.3
index f510a40180..6d575139d5 100644
--- a/src/lib/libcrypto/man/X509_STORE_CTX_get_error.3
+++ b/src/lib/libcrypto/man/X509_STORE_CTX_get_error.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: X509_STORE_CTX_get_error.3,v 1.9 2018/03/22 16:06:33 schwarze Exp $
+.\" $OpenBSD: X509_STORE_CTX_get_error.3,v 1.10 2018/03/23 23:18:17 schwarze Exp $
 .\" full merge up to:
 .\" OpenSSL crypto/X509_STORE_CTX_get_error f0e0fd51 Apr 14 23:59:26 2016 -0400
 .\" selective merge up to:
@@ -53,7 +53,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: March 22 2018 $
+.Dd $Mdocdate: March 23 2018 $
 .Dt X509_STORE_CTX_GET_ERROR 3
 .Os
 .Sh NAME
@@ -387,3 +387,9 @@ appeared before SSLeay 0.8 and have been available since
 .Fn X509_STORE_CTX_get1_chain
 first appeared in OpenSSL 0.9.5 and has been available since
 .Ox 2.7 .
+.Pp
+.Fn X509_STORE_CTX_get0_cert
+and
+.Fn X509_STORE_CTX_get0_chain
+first appeared in OpenSSL 1.1.0 and have been available since
+.Ox 6.3 .
diff --git a/src/lib/libcrypto/man/X509_STORE_CTX_new.3 b/src/lib/libcrypto/man/X509_STORE_CTX_new.3
index 34ccca26f7..501e2b0e78 100644
--- a/src/lib/libcrypto/man/X509_STORE_CTX_new.3
+++ b/src/lib/libcrypto/man/X509_STORE_CTX_new.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: X509_STORE_CTX_new.3,v 1.16 2018/03/23 14:26:40 schwarze Exp $
+.\" $OpenBSD: X509_STORE_CTX_new.3,v 1.17 2018/03/23 23:18:17 schwarze Exp $
 .\" full merge up to: OpenSSL 186bb907 Apr 13 11:05:13 2015 -0700
 .\" selective merge up to: OpenSSL 7643a172 Apr 21 13:35:51 2017 +0200
 .\"
@@ -349,7 +349,13 @@ first appeared in OpenSSL 0.9.8 and have been available since
 .Ox 4.5 .
 .Pp
 .Fn X509_STORE_CTX_get0_store
-first appeared in OpenSSL 1.0.2 and has been available since
+first appeared in OpenSSL 1.0.2.
+.Fn X509_STORE_CTX_set0_trusted_stack ,
+.Fn X509_STORE_CTX_get0_untrusted ,
+and
+.Fn X509_STORE_CTX_set0_untrusted
+first appeared in OpenSSL 1.1.0.
+These functions have been available since
 .Ox 6.3 .
 .Sh BUGS
 The certificates and CRLs in a context are used internally and should
diff --git a/src/lib/libcrypto/man/X509_STORE_new.3 b/src/lib/libcrypto/man/X509_STORE_new.3
index 96ec504353..d450ec1f95 100644
--- a/src/lib/libcrypto/man/X509_STORE_new.3
+++ b/src/lib/libcrypto/man/X509_STORE_new.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: X509_STORE_new.3,v 1.2 2018/03/21 03:28:40 schwarze Exp $
+.\" $OpenBSD: X509_STORE_new.3,v 1.3 2018/03/23 23:18:17 schwarze Exp $
 .\" full merge up to: OpenSSL 05ea606a May 20 20:52:46 2016 -0400
 .\" selective merge up to: OpenSSL 99d63d46 Oct 26 13:56:48 2016 -0400
 .\"
@@ -67,7 +67,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: March 21 2018 $
+.Dd $Mdocdate: March 23 2018 $
 .Dt X509_STORE_NEW 3
 .Os
 .Sh NAME
@@ -136,4 +136,5 @@ appeared before SSLeay 0.8 and have been available since
 .Ox 2.4 .
 .Pp
 .Fn X509_STORE_up_ref
-first appeared in OpenSSL 1.1.0.
+first appeared in OpenSSL 1.1.0 and has been available since
+.Ox 6.3 .
diff --git a/src/lib/libcrypto/man/X509_STORE_set1_param.3 b/src/lib/libcrypto/man/X509_STORE_set1_param.3
index ecb56c7b0a..d444eaf4f7 100644
--- a/src/lib/libcrypto/man/X509_STORE_set1_param.3
+++ b/src/lib/libcrypto/man/X509_STORE_set1_param.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: X509_STORE_set1_param.3,v 1.11 2018/03/23 00:09:11 schwarze Exp $
+.\" $OpenBSD: X509_STORE_set1_param.3,v 1.12 2018/03/23 23:18:17 schwarze Exp $
 .\" content checked up to:
 .\" OpenSSL man3/X509_STORE_get0_param e90fc053 Jul 15 09:39:45 2017 -0400
 .\"
@@ -208,5 +208,10 @@ and
 first appeared in OpenSSL 0.9.8 and have been available since
 .Ox 4.5 .
 .Pp
-.Fn X509_STORE_get0_objects
-first appeared in OpenSSL 1.1.0.
+.Fn X509_STORE_get0_objects ,
+.Fn X509_STORE_get_ex_new_index ,
+.Fn X509_STORE_set_ex_data ,
+and
+.Fn X509_STORE_get_ex_data
+first appeared in OpenSSL 1.1.0 and have been available since
+.Ox 6.3 .
diff --git a/src/lib/libcrypto/man/X509_STORE_set_verify_cb_func.3 b/src/lib/libcrypto/man/X509_STORE_set_verify_cb_func.3
index 82a49f7bfb..03ec907fb3 100644
--- a/src/lib/libcrypto/man/X509_STORE_set_verify_cb_func.3
+++ b/src/lib/libcrypto/man/X509_STORE_set_verify_cb_func.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: X509_STORE_set_verify_cb_func.3,v 1.6 2018/03/23 04:34:23 schwarze Exp $
+.\"     $OpenBSD: X509_STORE_set_verify_cb_func.3,v 1.7 2018/03/23 23:18:17 schwarze Exp $
 .\"     OpenSSL 05ea606a May 20 20:52:46 2016 -0400
 .\"
 .\" This file was written by Dr. Stephen Henson <steve@openssl.org>.
@@ -96,7 +96,8 @@ do not return a value.
 .Xr X509_STORE_new 3
 .Sh HISTORY
 .Fn X509_STORE_set_verify_cb_func
-is available in all versions of SSLeay and OpenSSL.
+appeared before SSLeay 0.8 and has been available since
+.Ox 2.4 .
 .Pp
 .Fn X509_STORE_set_verify_cb
 first appeared in OpenSSL 1.0.0 and has been available since
diff --git a/src/lib/libcrypto/man/X509_get0_notBefore.3 b/src/lib/libcrypto/man/X509_get0_notBefore.3
index 3af3074d27..334f70e599 100644
--- a/src/lib/libcrypto/man/X509_get0_notBefore.3
+++ b/src/lib/libcrypto/man/X509_get0_notBefore.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: X509_get0_notBefore.3,v 1.3 2018/02/25 10:53:16 schwarze Exp $
+.\" $OpenBSD: X509_get0_notBefore.3,v 1.4 2018/03/23 23:18:17 schwarze Exp $
 .\" content checked up to: OpenSSL 27b138e9 May 19 00:16:38 2017 +0000
 .\"
 .\" Copyright (c) 2018 Ingo Schwarze <schwarze@openbsd.org>
@@ -15,7 +15,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: February 25 2018 $
+.Dd $Mdocdate: March 23 2018 $
 .Dt X509_GET0_NOTBEFORE 3
 .Os
 .Sh NAME
@@ -152,3 +152,7 @@ return 1 on success or 0 on failure.
 .Xr X509_sign 3 ,
 .Xr X509_VAL_new 3 ,
 .Xr X509_verify_cert 3
+.Sh HISTORY
+These functions first appeared in OpenSSL 1.1.0
+and have been available since
+.Ox 6.3 .
diff --git a/src/lib/libcrypto/man/X509_get0_signature.3 b/src/lib/libcrypto/man/X509_get0_signature.3
index 5392dd677b..a0982f2193 100644
--- a/src/lib/libcrypto/man/X509_get0_signature.3
+++ b/src/lib/libcrypto/man/X509_get0_signature.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: X509_get0_signature.3,v 1.4 2018/03/23 14:26:40 schwarze Exp $
+.\" $OpenBSD: X509_get0_signature.3,v 1.5 2018/03/23 23:18:17 schwarze Exp $
 .\" selective merge up to:
 .\" OpenSSL man3/X509_get0_signature 2f7a2520 Apr 25 17:28:08 2017 +0100
 .\"
@@ -150,12 +150,13 @@ is not appropriate, for example in a non-standard or unsupported format.
 .Fn X509_get0_signature
 and
 .Fn X509_get_signature_nid
-first appeared in OpenSSL 1.0.2 and have been available since
-.Ox 6.3 .
-.Pp
+first appeared in OpenSSL 1.0.2.
 .Fn X509_REQ_get0_signature ,
 .Fn X509_CRL_get0_signature ,
+.Fn X509_get0_tbs_sigalg ,
 .Fn X509_REQ_get_signature_nid ,
 and
 .Fn X509_CRL_get_signature_nid
 first appeared in OpenSSL 1.1.0.
+All these functions have been available since
+.Ox 6.3 .
diff --git a/src/lib/libcrypto/man/X509_get_pubkey.3 b/src/lib/libcrypto/man/X509_get_pubkey.3
index 8b7a93f13b..e84ff0b18a 100644
--- a/src/lib/libcrypto/man/X509_get_pubkey.3
+++ b/src/lib/libcrypto/man/X509_get_pubkey.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: X509_get_pubkey.3,v 1.3 2018/03/21 03:16:08 schwarze Exp $
+.\" $OpenBSD: X509_get_pubkey.3,v 1.4 2018/03/23 23:18:17 schwarze Exp $
 .\" selective 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: March 21 2018 $
+.Dd $Mdocdate: March 23 2018 $
 .Dt X509_GET_PUBKEY 3
 .Os
 .Sh NAME
@@ -165,3 +165,7 @@ and
 .Fn X509_REQ_set_pubkey
 appeared before SSLeay 0.8 and have been available since
 .Ox 2.4 .
+.Pp
+.Fn X509_get0_pubkey
+first appeared in OpenSSL 1.1.0 and has been available since
+.Ox 6.3 .
diff --git a/src/lib/libcrypto/man/X509_new.3 b/src/lib/libcrypto/man/X509_new.3
index afade8fc5b..4bfc430549 100644
--- a/src/lib/libcrypto/man/X509_new.3
+++ b/src/lib/libcrypto/man/X509_new.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: X509_new.3,v 1.13 2018/03/23 14:26:40 schwarze Exp $
+.\" $OpenBSD: X509_new.3,v 1.14 2018/03/23 23:18:17 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>.
@@ -161,6 +161,10 @@ and
 appeared before SSLeay 0.8 and have been available since
 .Ox 2.4 .
 .Pp
+.Fn X509_up_ref
+first appeared in OpenSSL 1.1.0 and has been available since
+.Ox 6.1 .
+.Pp
 .Fn X509_chain_up_ref
 first appeared in OpenSSL 1.0.2 and has been available since
 .Ox 6.3 .
diff --git a/src/lib/libcrypto/man/X509_sign.3 b/src/lib/libcrypto/man/X509_sign.3
index f7ea043374..5341da6dc9 100644
--- a/src/lib/libcrypto/man/X509_sign.3
+++ b/src/lib/libcrypto/man/X509_sign.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: X509_sign.3,v 1.3 2018/03/23 05:48:56 schwarze Exp $
+.\"     $OpenBSD: X509_sign.3,v 1.4 2018/03/23 23:18:17 schwarze Exp $
 .\"     OpenSSL 99d63d46 Oct 26 13:56:48 2016 -0400
 .\"
 .\" This file was written by Dr. Stephen Henson <steve@openssl.org>.
@@ -203,11 +203,5 @@ appeared before SSLeay 0.8 and have been available since
 .Fn X509_REQ_sign_ctx ,
 and
 .Fn X509_CRL_sign_ctx
-were first added to OpenSSL 1.0.1.
-.Pp
-.Fn X509_sign_ctx ,
-.Fn X509_REQ_sign_ctx ,
-and
-.Fn X509_CRL_sign_ctx
 first appeared in OpenSSL 1.0.1 and have been available since
 .Ox 5.3 .
diff --git a/src/lib/libcrypto/man/d2i_ASN1_OCTET_STRING.3 b/src/lib/libcrypto/man/d2i_ASN1_OCTET_STRING.3
index e8a17ebb1d..451d5cdd77 100644
--- a/src/lib/libcrypto/man/d2i_ASN1_OCTET_STRING.3
+++ b/src/lib/libcrypto/man/d2i_ASN1_OCTET_STRING.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: d2i_ASN1_OCTET_STRING.3,v 1.10 2018/03/22 16:06:33 schwarze Exp $
+.\"     $OpenBSD: d2i_ASN1_OCTET_STRING.3,v 1.11 2018/03/23 23:18:17 schwarze Exp $
 .\"
 .\" Copyright (c) 2017 Ingo Schwarze <schwarze@openbsd.org>
 .\"
@@ -14,7 +14,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: March 22 2018 $
+.Dd $Mdocdate: March 23 2018 $
 .Dt D2I_ASN1_OCTET_STRING 3
 .Os
 .Sh NAME
@@ -432,3 +432,11 @@ These functions have been available since
 .Fn i2d_ASN1_PRINTABLESTRING
 first appeared in OpenSSL 0.9.5 and has been available since
 .Ox 2.7 .
+.Pp
+.Fn d2i_ASN1_UNIVERSALSTRING ,
+.Fn i2d_ASN1_UNIVERSALSTRING ,
+.Fn d2i_ASN1_GENERALSTRING ,
+and
+.Fn i2d_ASN1_GENERALSTRING
+first appeared in OpenSSL 0.9.7 and have been available since
+.Ox 3.2 .
diff --git a/src/lib/libcrypto/man/d2i_X509_NAME.3 b/src/lib/libcrypto/man/d2i_X509_NAME.3
index 7d5f3f268e..063a72edeb 100644
--- a/src/lib/libcrypto/man/d2i_X509_NAME.3
+++ b/src/lib/libcrypto/man/d2i_X509_NAME.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: d2i_X509_NAME.3,v 1.12 2018/03/21 03:16:08 schwarze Exp $
+.\" $OpenBSD: d2i_X509_NAME.3,v 1.13 2018/03/23 23:18:17 schwarze Exp $
 .\" checked up to:
 .\" OpenSSL crypto/d2i_X509_NAME 4692340e Jun 7 15:49:08 2016 -0400 and
 .\" OpenSSL man3/X509_NAME_get0_der 99d63d46 Oct 26 13:56:48 2016 -0400
@@ -17,7 +17,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: March 21 2018 $
+.Dd $Mdocdate: March 23 2018 $
 .Dt D2I_X509_NAME 3
 .Os
 .Sh NAME
@@ -185,3 +185,7 @@ and
 .Fn X509_NAME_ENTRY_dup
 appeared before SSLeay 0.8 and have been available since
 .Ox 2.4 .
+.Pp
+.Fn X509_NAME_get0_der
+first appeared in OpenSSL 1.1.0 and has been available since
+.Ox 6.3 .
diff --git a/src/lib/libcrypto/man/get_rfc3526_prime_8192.3 b/src/lib/libcrypto/man/get_rfc3526_prime_8192.3
index ff6289f10c..b26e28be9a 100644
--- a/src/lib/libcrypto/man/get_rfc3526_prime_8192.3
+++ b/src/lib/libcrypto/man/get_rfc3526_prime_8192.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: get_rfc3526_prime_8192.3,v 1.3 2018/03/23 01:05:50 schwarze Exp $
+.\" $OpenBSD: get_rfc3526_prime_8192.3,v 1.4 2018/03/23 23:18:17 schwarze Exp $
 .\" checked up to: OpenSSL DH_get_1024_160 99d63d46 Oct 26 13:56:48 2016 -0400
 .\"
 .\" Copyright (c) 2017 Ingo Schwarze <schwarze@openbsd.org>
@@ -163,6 +163,11 @@ and
 .Fn get_rfc3526_prime_8192
 first appeared in OpenSSL 0.9.8a and have been available since
 .Ox 4.5 .
+.Pp
+The
+.Sy BN_
+aliases first appeared in OpenSSL 1.1.0 and have been available since
+.Ox 6.3 .
 .Sh CAVEATS
 As all the memory needed for storing the numbers is dynamically
 allocated, the