crypto HISTORY up to 0.9.5; researched from OpenSSL git

48 files changed, 362 insertions, 140 deletions

diff --git a/src/lib/libcrypto/man/ACCESS_DESCRIPTION_new.3 b/src/lib/libcrypto/man/ACCESS_DESCRIPTION_new.3
index a7d894ae49..2c0a67134c 100644
--- a/src/lib/libcrypto/man/ACCESS_DESCRIPTION_new.3
+++ b/src/lib/libcrypto/man/ACCESS_DESCRIPTION_new.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: ACCESS_DESCRIPTION_new.3,v 1.3 2016/12/28 18:31:33 jmc Exp $
+.\"     $OpenBSD: ACCESS_DESCRIPTION_new.3,v 1.4 2018/03/22 16:06:33 schwarze Exp $
 .\"
 .\" Copyright (c) 2016 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: December 28 2016 $
+.Dd $Mdocdate: March 22 2018 $
 .Dt ACCESS_DESCRIPTION_NEW 3
 .Os
 .Sh NAME
@@ -140,3 +140,11 @@ RFC 6960: X.509 Internet Public Key Infrastructure Online Certificate
 Status Protocol
 .Pp
 RFC 3161: Internet X.509 Public Key Infrastructure Time-Stamp Protocol
+.Sh HISTORY
+.Fn ACCESS_DESCRIPTION_new ,
+.Fn ACCESS_DESCRIPTION_free ,
+.Fn AUTHORITY_INFO_ACCESS_new ,
+and
+.Fn AUTHORITY_INFO_ACCESS_free
+first appeared in OpenSSL 0.9.5 and have been available since
+.Ox 2.7 .
diff --git a/src/lib/libcrypto/man/ASN1_STRING_TABLE_add.3 b/src/lib/libcrypto/man/ASN1_STRING_TABLE_add.3
index 964f7204d0..cf5741e987 100644
--- a/src/lib/libcrypto/man/ASN1_STRING_TABLE_add.3
+++ b/src/lib/libcrypto/man/ASN1_STRING_TABLE_add.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: ASN1_STRING_TABLE_add.3,v 1.2 2017/08/20 18:06:42 jmc Exp $
+.\"     $OpenBSD: ASN1_STRING_TABLE_add.3,v 1.3 2018/03/22 16:06:33 schwarze Exp $
 .\"     OpenSSL ASN1_STRING_TABLE_add.pod 7b608d08 Jul 27 01:18:50 2017 +0800
 .\"
 .\" Copyright (c) 2017 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: August 20 2017 $
+.Dd $Mdocdate: March 22 2018 $
 .Dt ASN1_STRING_TABLE_ADD 3
 .Os
 .Sh NAME
@@ -88,5 +88,12 @@ if nothing is found.
 .Xr ASN1_OBJECT_new 3 ,
 .Xr ERR_get_error 3 ,
 .Xr OBJ_nid2obj 3
+.Sh HISTORY
+.Fn ASN1_STRING_TABLE_add ,
+.Fn ASN1_STRING_TABLE_get ,
+and
+.Fn ASN1_STRING_TABLE_cleanup
+first appeared in OpenSSL 0.9.5 and have been available since
+.Ox 2.7 .
 .Sh BUGS
 Most aspects of the semantics considerably differ from OpenSSL.
diff --git a/src/lib/libcrypto/man/ASN1_STRING_length.3 b/src/lib/libcrypto/man/ASN1_STRING_length.3
index 158eabf913..0a524f9e42 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.10 2018/03/21 05:43:56 schwarze Exp $
+.\" $OpenBSD: ASN1_STRING_length.3,v 1.11 2018/03/22 16:06:33 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 21 2018 $
+.Dd $Mdocdate: March 22 2018 $
 .Dt ASN1_STRING_LENGTH 3
 .Os
 .Sh NAME
@@ -301,3 +301,7 @@ appeared in SSLeay 0.8.1b or earlier.
 first appeared in SSLeay 0.9.0.
 All these functions have been available since
 .Ox 2.4 .
+.Pp
+.Fn ASN1_STRING_length_set
+first appeared in OpenSSL 0.9.5 and has been available since
+.Ox 2.7 .
diff --git a/src/lib/libcrypto/man/ASN1_STRING_print_ex.3 b/src/lib/libcrypto/man/ASN1_STRING_print_ex.3
index cea69c8081..0667bc08e5 100644
--- a/src/lib/libcrypto/man/ASN1_STRING_print_ex.3
+++ b/src/lib/libcrypto/man/ASN1_STRING_print_ex.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ASN1_STRING_print_ex.3,v 1.10 2018/03/20 18:35:13 schwarze Exp $
+.\" $OpenBSD: ASN1_STRING_print_ex.3,v 1.11 2018/03/22 16:06:33 schwarze Exp $
 .\" full merge up to: OpenSSL bb9ad09e Jun 6 00:43:05 2016 -0400
 .\" selective merge up to: OpenSSL 61f805c1 Jan 16 01:01:46 2018 +0800
 .\"
@@ -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 20 2018 $
+.Dd $Mdocdate: March 22 2018 $
 .Dt ASN1_STRING_PRINT_EX 3
 .Os
 .Sh NAME
@@ -225,3 +225,7 @@ returns a static string.
 .Fn ASN1_STRING_print
 appeared in SSLeay 0.8.1b or earlier and has been available since
 .Ox 2.4 .
+.Pp
+.Fn ASN1_tag2str
+first appeared in OpenSSL 0.9.5 and has been available since
+.Ox 2.7 .
diff --git a/src/lib/libcrypto/man/BIO_ctrl.3 b/src/lib/libcrypto/man/BIO_ctrl.3
index 2c9d385a41..a32ed80da7 100644
--- a/src/lib/libcrypto/man/BIO_ctrl.3
+++ b/src/lib/libcrypto/man/BIO_ctrl.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: BIO_ctrl.3,v 1.12 2018/03/21 21:18:08 schwarze Exp $
+.\"     $OpenBSD: BIO_ctrl.3,v 1.13 2018/03/22 16:06:33 schwarze Exp $
 .\"     OpenSSL b055fceb Thu Oct 20 09:56:18 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: March 21 2018 $
+.Dd $Mdocdate: March 22 2018 $
 .Dt BIO_CTRL 3
 .Os
 .Sh NAME
@@ -340,6 +340,10 @@ and
 first appeared in OpenSSL 0.9.4.
 These functions have been available since
 .Ox 2.6 .
+.Pp
+.Fn BIO_callback_ctrl
+first appeared in OpenSSL 0.9.5 and has been available since
+.Ox 2.7 .
 .Sh BUGS
 Some of the return values are ambiguous and care should be taken.
 In particular a return value of 0 can be returned if an operation
diff --git a/src/lib/libcrypto/man/BIO_get_ex_new_index.3 b/src/lib/libcrypto/man/BIO_get_ex_new_index.3
index e773947acc..ec6ac25e54 100644
--- a/src/lib/libcrypto/man/BIO_get_ex_new_index.3
+++ b/src/lib/libcrypto/man/BIO_get_ex_new_index.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: BIO_get_ex_new_index.3,v 1.5 2018/03/21 06:09:37 schwarze Exp $
+.\" $OpenBSD: BIO_get_ex_new_index.3,v 1.6 2018/03/22 16:06:33 schwarze Exp $
 .\" full merge up to: OpenSSL a970b14f Jul 31 18:58:40 2017 -0400
 .\" selective merge up to: OpenSSL 61f805c1 Jan 16 01:01:46 2018 +0800
 .\"
@@ -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 22 2018 $
 .Dt BIO_GET_EX_NEW_INDEX 3
 .Os
 .Sh NAME
@@ -141,3 +141,10 @@ and
 .Fn BIO_get_ex_data
 first appeared in SSLeay 0.9.0 and have been available since
 .Ox 2.4 .
+.Pp
+.Fn X509_get_ex_new_index ,
+.Fn X509_set_ex_data ,
+and
+.Fn X509_get_ex_data
+first appeared in OpenSSL 0.9.5 and have been available since
+.Ox 2.7 .
diff --git a/src/lib/libcrypto/man/BIO_s_bio.3 b/src/lib/libcrypto/man/BIO_s_bio.3
index be67fd2b06..5fa428a2fb 100644
--- a/src/lib/libcrypto/man/BIO_s_bio.3
+++ b/src/lib/libcrypto/man/BIO_s_bio.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: BIO_s_bio.3,v 1.10 2018/03/21 21:18:08 schwarze Exp $
+.\"     $OpenBSD: BIO_s_bio.3,v 1.11 2018/03/22 16:06:33 schwarze Exp $
 .\"     OpenSSL c03726ca Aug 27 12:28:08 2015 -0400
 .\"
 .\" This file was written by
@@ -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 21 2018 $
+.Dd $Mdocdate: March 22 2018 $
 .Dt BIO_S_BIO 3
 .Os
 .Sh NAME
@@ -374,6 +374,10 @@ and
 .Fn BIO_ctrl_reset_read_request
 first appeared in OpenSSL 0.9.4 and have been available since
 .Ox 2.6 .
+.Pp
+.Fn BIO_ctrl_reset_read_request
+first appeared in OpenSSL 0.9.5 and has been available since
+.Ox 2.7 .
 .Sh CAVEATS
 As the data is buffered, SSL operations may return with an
 .Dv ERROR_SSL_WANT_READ
diff --git a/src/lib/libcrypto/man/BIO_s_mem.3 b/src/lib/libcrypto/man/BIO_s_mem.3
index f4abfc9348..857dc85519 100644
--- a/src/lib/libcrypto/man/BIO_s_mem.3
+++ b/src/lib/libcrypto/man/BIO_s_mem.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: BIO_s_mem.3,v 1.8 2018/03/21 09:03:49 schwarze Exp $
+.\" $OpenBSD: BIO_s_mem.3,v 1.9 2018/03/22 16:06:33 schwarze Exp $
 .\" full merge up to: OpenSSL 8711efb4 Mon Apr 20 11:33:12 2009 +0000
 .\" selective merge up to: OpenSSL 61f805c1 Jan 16 01:01:46 2018 +0800
 .\"
@@ -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 22 2018 $
 .Dt BIO_S_MEM 3
 .Os
 .Sh NAME
@@ -263,6 +263,10 @@ and
 .Fn BIO_get_mem_data
 first appeared in SSLeay 0.9.1 and have been available since
 .Ox 2.6 .
+.Pp
+.Fn BIO_new_mem_buf
+first appeared in OpenSSL 0.9.5 and has been available since
+.Ox 2.7 .
 .Sh BUGS
 There should be an option to set the maximum size of a memory BIO.
 .Pp
diff --git a/src/lib/libcrypto/man/BN_CTX_start.3 b/src/lib/libcrypto/man/BN_CTX_start.3
index 2b48d892e5..f4f10b8b0c 100644
--- a/src/lib/libcrypto/man/BN_CTX_start.3
+++ b/src/lib/libcrypto/man/BN_CTX_start.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: BN_CTX_start.3,v 1.6 2016/12/10 21:13:25 schwarze Exp $
+.\"     $OpenBSD: BN_CTX_start.3,v 1.7 2018/03/22 16:06:33 schwarze Exp $
 .\"     OpenSSL 99d63d46 Oct 26 13:56:48 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: December 10 2016 $
+.Dd $Mdocdate: March 22 2018 $
 .Dt BN_CTX_START 3
 .Os
 .Sh NAME
@@ -128,4 +128,5 @@ In case of an error, an error code is set which can be obtained by
 .Fn BN_CTX_get ,
 and
 .Fn BN_CTX_end
-were added in 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/BN_generate_prime.3 b/src/lib/libcrypto/man/BN_generate_prime.3
index 8ff144e421..20fd93897c 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.10 2018/03/21 09:03:49 schwarze Exp $
+.\" $OpenBSD: BN_generate_prime.3,v 1.11 2018/03/22 16:06:33 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>
@@ -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 22 2018 $
 .Dt BN_GENERATE_PRIME 3
 .Os
 .Sh NAME
@@ -393,7 +393,8 @@ was added in SSLeay 0.9.1 and
 .Ox 2.6 .
 .Pp
 .Fn BN_is_prime_fasttest
-was added in OpenSSL 0.9.5.
+first appeared in OpenSSL 0.9.5 and has been available since
+.Ox 2.7 .
 .Pp
 .Fn BN_GENCB_new ,
 .Fn BN_GENCB_free ,
diff --git a/src/lib/libcrypto/man/BN_rand.3 b/src/lib/libcrypto/man/BN_rand.3
index b8d225057d..c9ad000011 100644
--- a/src/lib/libcrypto/man/BN_rand.3
+++ b/src/lib/libcrypto/man/BN_rand.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: BN_rand.3,v 1.7 2018/03/20 20:26:23 schwarze Exp $
+.\"     $OpenBSD: BN_rand.3,v 1.8 2018/03/22 16:06:33 schwarze Exp $
 .\"     OpenSSL 05ea606a May 20 20:52:46 2016 -0400
 .\"
 .\" 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 22 2018 $
 .Dt BN_RAND 3
 .Os
 .Sh NAME
@@ -143,7 +143,8 @@ appeared before SSLeay 0.8 and has been available since
 .Ox 2.4 .
 .Pp
 .Fn BN_pseudo_rand
-first appeared in OpenSSL 0.9.5.
+first appeared in OpenSSL 0.9.5 and has been available since
+.Ox 2.7 .
 .Pp
 The
 .Fa top
diff --git a/src/lib/libcrypto/man/CRYPTO_set_ex_data.3 b/src/lib/libcrypto/man/CRYPTO_set_ex_data.3
index e4a7087efd..9de936d20a 100644
--- a/src/lib/libcrypto/man/CRYPTO_set_ex_data.3
+++ b/src/lib/libcrypto/man/CRYPTO_set_ex_data.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: CRYPTO_set_ex_data.3,v 1.8 2018/03/21 06:33:19 schwarze Exp $
+.\"     $OpenBSD: CRYPTO_set_ex_data.3,v 1.9 2018/03/22 16:06:33 schwarze Exp $
 .\"     OpenSSL CRYPTO_get_ex_new_index.pod 35cb565a Nov 19 15:49:30 2015 -0500
 .\"
 .\" This file was written by Dr. Stephen Henson <steve@openssl.org>.
@@ -98,7 +98,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 22 2018 $
 .Dt CRYPTO_SET_EX_DATA 3
 .Os
 .Sh NAME
@@ -399,3 +399,10 @@ and
 .Fn CRYPTO_new_ex_data
 first appeared in SSLeay 0.9.0 and have been available since
 .Ox 2.4 .
+.Pp
+.Fn CRYPTO_EX_new ,
+.Fn CRYPTO_EX_free ,
+and
+.Fn CRYPTO_EX_dup
+first appeared in OpenSSL 0.9.5 and have been available since
+.Ox 2.7 .
diff --git a/src/lib/libcrypto/man/DES_set_key.3 b/src/lib/libcrypto/man/DES_set_key.3
index 44c6dcbc43..64038faa98 100644
--- a/src/lib/libcrypto/man/DES_set_key.3
+++ b/src/lib/libcrypto/man/DES_set_key.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: DES_set_key.3,v 1.9 2018/03/20 22:06:59 schwarze Exp $
+.\" $OpenBSD: DES_set_key.3,v 1.10 2018/03/22 16:06:33 schwarze Exp $
 .\" full merge up to:
 .\" OpenSSL man3/DES_random_key 61f805c1 Jan 16 01:01:46 2018 +0800
 .\"
@@ -115,7 +115,7 @@
 .\" copied and put under another distribution licence
 .\" [including the GNU Public Licence.]
 .\"
-.Dd $Mdocdate: March 20 2018 $
+.Dd $Mdocdate: March 22 2018 $
 .Dt DES_SET_KEY 3
 .Os
 .Sh NAME
@@ -822,6 +822,15 @@ with lower case names starting with
 appeared in SSLeay 0.8.1b or earlier and have been available since
 .Ox 2.4 .
 .Pp
+Versions of
+.Fn DES_set_key_checked
+and
+.Fn DES_set_key_unchecked
+with lower case names starting with
+.Sy des_
+first appeared in OpenSSL 0.9.5 and have been available since
+.Ox 2.7 .
+.Pp
 In OpenSSL 0.9.7, all
 .Sy des_
 functions were renamed to
diff --git a/src/lib/libcrypto/man/DH_set_method.3 b/src/lib/libcrypto/man/DH_set_method.3
index 31d9b54ca7..77d1616445 100644
--- a/src/lib/libcrypto/man/DH_set_method.3
+++ b/src/lib/libcrypto/man/DH_set_method.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: DH_set_method.3,v 1.5 2016/12/10 22:22:59 schwarze Exp $
+.\"     $OpenBSD: DH_set_method.3,v 1.6 2018/03/22 16:06:33 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: December 10 2016 $
+.Dd $Mdocdate: March 22 2018 $
 .Dt DH_SET_METHOD 3
 .Os
 .Sh NAME
@@ -227,7 +227,8 @@ Otherwise it returns a pointer to the newly allocated structure.
 .Fn DH_new_method
 and
 .Fn DH_OpenSSL
-were added in OpenSSL 0.9.4.
+first appeared in OpenSSL 0.9.5 and have been available since
+.Ox 2.7 .
 .Sh CAVEATS
 As of version 0.9.7,
 .Vt DH_METHOD
diff --git a/src/lib/libcrypto/man/DSA_get_ex_new_index.3 b/src/lib/libcrypto/man/DSA_get_ex_new_index.3
index 70235184ce..8fe055f337 100644
--- a/src/lib/libcrypto/man/DSA_get_ex_new_index.3
+++ b/src/lib/libcrypto/man/DSA_get_ex_new_index.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: DSA_get_ex_new_index.3,v 1.4 2016/12/10 22:47:49 schwarze Exp $
+.\"     $OpenBSD: DSA_get_ex_new_index.3,v 1.5 2018/03/22 16:06:33 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 22 2018 $
 .Dt DSA_GET_EX_NEW_INDEX 3
 .Os
 .Sh NAME
@@ -94,4 +94,5 @@ and
 .Fn DSA_set_ex_data ,
 and
 .Fn DSA_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/DSA_set_method.3 b/src/lib/libcrypto/man/DSA_set_method.3
index 9b8412426a..f54c392097 100644
--- a/src/lib/libcrypto/man/DSA_set_method.3
+++ b/src/lib/libcrypto/man/DSA_set_method.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: DSA_set_method.3,v 1.7 2018/03/18 13:06:36 schwarze Exp $
+.\"     $OpenBSD: DSA_set_method.3,v 1.8 2018/03/22 16:06:33 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 18 2018 $
+.Dd $Mdocdate: March 22 2018 $
 .Dt DSA_SET_METHOD 3
 .Os
 .Sh NAME
@@ -232,7 +232,8 @@ Otherwise it returns a pointer to the newly allocated structure.
 .Fn DSA_new_method ,
 and
 .Fn DSA_OpenSSL
-were added in OpenSSL 0.9.4.
+first appeared in OpenSSL 0.9.5 and have been available since
+.Ox 2.7 .
 .Sh CAVEATS
 As of version 0.9.7, DSA_METHOD implementations are grouped together
 with other algorithmic APIs (e.g. RSA_METHOD, EVP_CIPHER) in
diff --git a/src/lib/libcrypto/man/EVP_DigestInit.3 b/src/lib/libcrypto/man/EVP_DigestInit.3
index 0ca3e4f1ed..bdad07665c 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.11 2018/03/21 16:09:51 schwarze Exp $
+.\" $OpenBSD: EVP_DigestInit.3,v 1.12 2018/03/22 16:06:33 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 21 2018 $
+.Dd $Mdocdate: March 22 2018 $
 .Dt EVP_DIGESTINIT 3
 .Os
 .Sh NAME
@@ -653,6 +653,10 @@ All these functions have been available since
 first appeared in OpenSSL 0.9.2b and has been available since
 .Ox 2.6 .
 .Pp
+.Fn EVP_MD_CTX_md
+first appeared in OpenSSL 0.9.5 and has been available since
+.Ox 2.7 .
+.Pp
 .Fn EVP_MD_CTX_init ,
 .Fn EVP_MD_CTX_create ,
 .Fn EVP_MD_CTX_copy_ex ,
diff --git a/src/lib/libcrypto/man/EVP_PKEY_set1_RSA.3 b/src/lib/libcrypto/man/EVP_PKEY_set1_RSA.3
index a1836fbe1d..ee8191bc8f 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.8 2018/03/20 23:56:07 schwarze Exp $
+.\" $OpenBSD: EVP_PKEY_set1_RSA.3,v 1.9 2018/03/22 16:06:33 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
 .\"
@@ -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 22 2018 $
 .Dt EVP_PKEY_SET1_RSA 3
 .Os
 .Sh NAME
@@ -304,3 +304,13 @@ and
 .Fn EVP_PKEY_type
 appeared in SSLeay 0.8.1b or earlier and have been available since
 .Ox 2.4 .
+.Pp
+.Fn EVP_PKEY_set1_RSA ,
+.Fn EVP_PKEY_set1_DSA ,
+.Fn EVP_PKEY_set1_DH ,
+.Fn EVP_PKEY_get1_RSA ,
+.Fn EVP_PKEY_get1_DSA ,
+and
+.Fn EVP_PKEY_get1_DH
+first appeared in OpenSSL 0.9.5 and have been available since
+.Ox 2.7 .
diff --git a/src/lib/libcrypto/man/GENERAL_NAME_new.3 b/src/lib/libcrypto/man/GENERAL_NAME_new.3
index aeee3e0444..3966ece697 100644
--- a/src/lib/libcrypto/man/GENERAL_NAME_new.3
+++ b/src/lib/libcrypto/man/GENERAL_NAME_new.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: GENERAL_NAME_new.3,v 1.3 2018/03/21 16:09:51 schwarze Exp $
+.\"     $OpenBSD: GENERAL_NAME_new.3,v 1.4 2018/03/22 16:06:33 schwarze Exp $
 .\"
 .\" Copyright (c) 2016 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 22 2018 $
 .Dt GENERAL_NAME_NEW 3
 .Os
 .Sh NAME
@@ -150,3 +150,9 @@ and
 .Fn GENERAL_NAMES_free
 first appeared in OpenSSL 0.9.2b and have been available since
 .Ox 2.6 .
+.Pp
+.Fn OTHERNAME_new
+and
+.Fn OTHERNAME_free
+first appeared in OpenSSL 0.9.5 and have been available since
+.Ox 2.7 .
diff --git a/src/lib/libcrypto/man/OpenSSL_add_all_algorithms.3 b/src/lib/libcrypto/man/OpenSSL_add_all_algorithms.3
index 329fef8130..6cc4a2770c 100644
--- a/src/lib/libcrypto/man/OpenSSL_add_all_algorithms.3
+++ b/src/lib/libcrypto/man/OpenSSL_add_all_algorithms.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: OpenSSL_add_all_algorithms.3,v 1.5 2018/03/21 22:08:04 schwarze Exp $
+.\" $OpenBSD: OpenSSL_add_all_algorithms.3,v 1.6 2018/03/22 16:06:33 schwarze Exp $
 .\" full merge up to: OpenSSL b3696a55 Sep 2 09:35:50 2017 -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 22 2018 $
 .Dt OPENSSL_ADD_ALL_ALGORITHMS 3
 .Os
 .Sh NAME
@@ -107,6 +107,13 @@ and
 .Fn SSLeay_add_all_digests
 appeared in SSLeay 0.8.1b or earlier and have been available since
 .Ox 2.4 .
+.Pp
+.Fn OpenSSL_add_all_algorithms ,
+.Fn OpenSSL_add_all_ciphers ,
+and
+.Fn OpenSSL_add_all_digests
+first appeared in OpenSSL 0.9.5 and have been available since
+.Ox 2.7 .
 .Sh BUGS
 Although the functions do not return error codes, it is possible for them
 to fail.
diff --git a/src/lib/libcrypto/man/PEM_read_bio_PrivateKey.3 b/src/lib/libcrypto/man/PEM_read_bio_PrivateKey.3
index f235931fa6..01f7817123 100644
--- a/src/lib/libcrypto/man/PEM_read_bio_PrivateKey.3
+++ b/src/lib/libcrypto/man/PEM_read_bio_PrivateKey.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: PEM_read_bio_PrivateKey.3,v 1.10 2018/03/21 21:18:08 schwarze Exp $
+.\"     $OpenBSD: PEM_read_bio_PrivateKey.3,v 1.11 2018/03/22 16:06:33 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 21 2018 $
+.Dd $Mdocdate: March 22 2018 $
 .Dt PEM_READ_BIO_PRIVATEKEY 3
 .Os
 .Sh NAME
@@ -1278,6 +1278,30 @@ and
 .Fn PEM_write_NETSCAPE_CERT_SEQUENCE ,
 first appeared in OpenSSL 0.9.4 and have been available since
 .Ox 2.6 .
+.Pp
+.Fn PEM_write_bio_PKCS8PrivateKey_nid ,
+.Fn PEM_write_PKCS8PrivateKey_nid ,
+.Fn PEM_read_bio_PUBKEY ,
+.Fn PEM_read_PUBKEY ,
+.Fn PEM_write_bio_PUBKEY ,
+.Fn PEM_write_PUBKEY ,
+.Fn PEM_read_bio_RSA_PUBKEY ,
+.Fn PEM_read_RSA_PUBKEY ,
+.Fn PEM_write_bio_RSA_PUBKEY ,
+.Fn PEM_write_RSA_PUBKEY ,
+.Fn PEM_read_bio_DSA_PUBKEY ,
+.Fn PEM_read_DSA_PUBKEY ,
+.Fn PEM_write_bio_DSA_PUBKEY ,
+.Fn PEM_write_DSA_PUBKEY ,
+.Fn PEM_write_bio_X509_REQ_NEW ,
+.Fn PEM_write_X509_REQ_NEW ,
+.Fn PEM_read_bio_X509_AUX ,
+.Fn PEM_read_X509_AUX ,
+.Fn PEM_write_bio_X509_AUX ,
+and
+.Fn PEM_write_X509_AUX
+first appeared in OpenSSL 0.9.5 and have been available since
+.Ox 2.7 .
 .Sh CAVEATS
 A frequent cause of problems is attempting to use the PEM routines like
 this:
diff --git a/src/lib/libcrypto/man/PKCS12_newpass.3 b/src/lib/libcrypto/man/PKCS12_newpass.3
index b651a575ba..48e4060c91 100644
--- a/src/lib/libcrypto/man/PKCS12_newpass.3
+++ b/src/lib/libcrypto/man/PKCS12_newpass.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: PKCS12_newpass.3,v 1.1 2016/11/28 23:02:16 schwarze Exp $
+.\"     $OpenBSD: PKCS12_newpass.3,v 1.2 2018/03/22 16:06:33 schwarze Exp $
 .\"     OpenSSL c95a8b4e May 5 14:26:26 2016 +0100
 .\"
 .\" This file was written by Jeffrey Walton <noloader@gmail.com>.
@@ -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: November 28 2016 $
+.Dd $Mdocdate: March 22 2018 $
 .Dt PKCS12_NEWPASS 3
 .Os
 .Sh NAME
@@ -149,6 +149,10 @@ int main(int argc, char **argv)
 .Sh SEE ALSO
 .Xr ERR_get_error 3 ,
 .Xr PKCS12_create 3
+.Sh HISTORY
+.Fn PKCS12_newpass
+first appeared in OpenSSL 0.9.5 and has been available since
+.Ox 2.7 .
 .Sh BUGS
 The password format is a NUL terminated ASCII string which is
 converted to Unicode form internally.
diff --git a/src/lib/libcrypto/man/PKCS7_decrypt.3 b/src/lib/libcrypto/man/PKCS7_decrypt.3
index 234d76357a..1a3ba7c67d 100644
--- a/src/lib/libcrypto/man/PKCS7_decrypt.3
+++ b/src/lib/libcrypto/man/PKCS7_decrypt.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: PKCS7_decrypt.3,v 1.6 2016/12/13 15:00:22 schwarze Exp $
+.\"     $OpenBSD: PKCS7_decrypt.3,v 1.7 2018/03/22 16:06:33 schwarze Exp $
 .\"     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: December 13 2016 $
+.Dd $Mdocdate: March 22 2018 $
 .Dt PKCS7_DECRYPT 3
 .Os
 .Sh NAME
@@ -107,7 +107,8 @@ The error can be obtained from
 .Xr PKCS7_new 3
 .Sh HISTORY
 .Fn PKCS7_decrypt
-was added to OpenSSL 0.9.5.
+first appeared in OpenSSL 0.9.5 and has been available since
+.Ox 2.7 .
 .Sh BUGS
 .Fn PKCS7_decrypt
 must be passed the correct recipient key and certificate.
diff --git a/src/lib/libcrypto/man/PKCS7_encrypt.3 b/src/lib/libcrypto/man/PKCS7_encrypt.3
index 8934191af6..324cb545d7 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.6 2017/01/12 16:13:51 jmc Exp $
+.\"     $OpenBSD: PKCS7_encrypt.3,v 1.7 2018/03/22 16:06:33 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: January 12 2017 $
+.Dd $Mdocdate: March 22 2018 $
 .Dt PKCS7_ENCRYPT 3
 .Os
 .Sh NAME
@@ -159,7 +159,9 @@ The error can be obtained from
 .Xr PKCS7_new 3
 .Sh HISTORY
 .Xr PKCS7_decrypt 3
-was added to OpenSSL 0.9.5.
+first appeared in OpenSSL 0.9.5 and has been available since
+.Ox 2.7 .
+.Pp
 The
 .Dv PKCS7_STREAM
 flag was first supported in OpenSSL 1.0.0.
diff --git a/src/lib/libcrypto/man/PKCS7_sign.3 b/src/lib/libcrypto/man/PKCS7_sign.3
index fc836d5d33..aea1a265c2 100644
--- a/src/lib/libcrypto/man/PKCS7_sign.3
+++ b/src/lib/libcrypto/man/PKCS7_sign.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: PKCS7_sign.3,v 1.7 2017/01/12 16:13:51 jmc Exp $
+.\"     $OpenBSD: PKCS7_sign.3,v 1.8 2018/03/22 16:06:33 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: January 12 2017 $
+.Dd $Mdocdate: March 22 2018 $
 .Dt PKCS7_SIGN 3
 .Os
 .Sh NAME
@@ -232,7 +232,8 @@ The error can be obtained from
 .Xr PKCS7_verify 3
 .Sh HISTORY
 .Fn PKCS7_sign
-was added to OpenSSL 0.9.5.
+first appeared in OpenSSL 0.9.5 and have been available since
+.Ox 2.7 .
 .Pp
 The
 .Dv PKCS7_PARTIAL
diff --git a/src/lib/libcrypto/man/PKCS7_verify.3 b/src/lib/libcrypto/man/PKCS7_verify.3
index 716282ead3..e800c90c54 100644
--- a/src/lib/libcrypto/man/PKCS7_verify.3
+++ b/src/lib/libcrypto/man/PKCS7_verify.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: PKCS7_verify.3,v 1.6 2018/02/25 17:46:38 schwarze Exp $
+.\"     $OpenBSD: PKCS7_verify.3,v 1.7 2018/03/22 16:06:33 schwarze Exp $
 .\"     OpenSSL a528d4f0 Oct 27 13:40:11 2015 -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: February 25 2018 $
+.Dd $Mdocdate: March 22 2018 $
 .Dt PKCS7_VERIFY 3
 .Os
 .Sh NAME
@@ -230,7 +230,10 @@ The error can be obtained from
 .Xr X509_STORE_new 3
 .Sh HISTORY
 .Fn PKCS7_verify
-was added to OpenSSL 0.9.5 .
+and
+.Fn PKCS7_get0_signers
+first appeared in OpenSSL 0.9.5 and have been available since
+.Ox 2.7 .
 .Sh BUGS
 The trusted certificate store is not searched for the signer's
 certificate.
diff --git a/src/lib/libcrypto/man/RAND_add.3 b/src/lib/libcrypto/man/RAND_add.3
index 5744d5c3ff..a8088c53cd 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.7 2018/03/21 01:02:06 schwarze Exp $
+.\" $OpenBSD: RAND_add.3,v 1.8 2018/03/22 16:06:33 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 21 2018 $
+.Dd $Mdocdate: March 22 2018 $
 .Dt RAND_ADD 3
 .Os
 .Sh NAME
@@ -61,3 +61,9 @@ and
 .Fn RAND_seed
 appeared in SSLeay 0.8.1b or earlier and have been available since
 .Ox 2.4 .
+.Pp
+.Fn RAND_add
+and
+.Fn RAND_status
+first appeared in OpenSSL 0.9.5 and have been available since
+.Ox 2.7 .
diff --git a/src/lib/libcrypto/man/RAND_bytes.3 b/src/lib/libcrypto/man/RAND_bytes.3
index f0bd85b9e3..29dcc0aaa2 100644
--- a/src/lib/libcrypto/man/RAND_bytes.3
+++ b/src/lib/libcrypto/man/RAND_bytes.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: RAND_bytes.3,v 1.4 2018/03/21 01:02:06 schwarze Exp $
+.\"     $OpenBSD: RAND_bytes.3,v 1.5 2018/03/22 16:06:33 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 21 2018 $
+.Dd $Mdocdate: March 22 2018 $
 .Dt RAND_BYTES 3
 .Os
 .Sh NAME
@@ -100,8 +100,9 @@ returns 1.
 .Fn RAND_bytes
 appeared in SSLeay 0.8.1b or earlier and has been available since
 .Ox 2.4 .
-It has a return
-value since OpenSSL 0.9.5.
+It has a return value since OpenSSL 0.9.5 and
+.Ox 2.7 .
 .Pp
 .Fn RAND_pseudo_bytes
-was added in OpenSSL 0.9.5.
+first appeared in OpenSSL 0.9.5 and has been available since
+.Ox 2.7 .
diff --git a/src/lib/libcrypto/man/RSA_set_method.3 b/src/lib/libcrypto/man/RSA_set_method.3
index 8fe70e68a6..e54e7b5d7e 100644
--- a/src/lib/libcrypto/man/RSA_set_method.3
+++ b/src/lib/libcrypto/man/RSA_set_method.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: RSA_set_method.3,v 1.9 2018/03/21 21:18:08 schwarze Exp $
+.\"     $OpenBSD: RSA_set_method.3,v 1.10 2018/03/22 16:06:33 schwarze Exp $
 .\"     OpenSSL 99d63d46 Oct 26 13:56:48 2016 -0400
 .\"
 .\" 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 22 2018 $
 .Dt RSA_SET_METHOD 3
 .Os
 .Sh NAME
@@ -61,9 +61,7 @@
 .Nm RSA_PKCS1_SSLeay ,
 .Nm RSA_null_method ,
 .Nm RSA_flags ,
-.Nm RSA_new_method ,
-.Nm RSA_get_default_openssl_method ,
-.Nm RSA_set_default_openssl_method
+.Nm RSA_new_method
 .Nd select RSA method
 .Sh SYNOPSIS
 .In openssl/rsa.h
@@ -327,32 +325,9 @@ components of
 first appeared in OpenSSL 0.9.4 and have been available since
 .Ox 2.6 .
 .Pp
-.Fn RSA_set_default_openssl_method
-and
-.Fn RSA_get_default_openssl_method
-replaced
-.Fn RSA_set_default_method
-and
-.Fn RSA_get_default_method
-respectively, and
-.Fn RSA_set_method
-and
-.Fn RSA_new_method
-were altered to use
-.Vt ENGINE Ns s
-rather than
-.Vt RSA_METHOD Ns s
-during development of the
-.Xr engine 3
-version of OpenSSL 0.9.6.
-For 0.9.7, the handling of defaults in the
-.Xr engine 3
-API was restructured so that this change was reversed, and behaviour
-of the other functions resembled more closely the previous behaviour.
-The behaviour of defaults in the
-.Xr engine 3
-API now transparently overrides the behaviour of defaults in the
-RSA API without requiring changing these function prototypes.
+.Fn RSA_null_method
+first appeared in OpenSSL 0.9.5 and has been available since
+.Ox 2.7 .
 .Sh CAVEATS
 As of version 0.9.7,
 .Vt RSA_METHOD
diff --git a/src/lib/libcrypto/man/SMIME_read_PKCS7.3 b/src/lib/libcrypto/man/SMIME_read_PKCS7.3
index a7cfc8733e..417d97bef3 100644
--- a/src/lib/libcrypto/man/SMIME_read_PKCS7.3
+++ b/src/lib/libcrypto/man/SMIME_read_PKCS7.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: SMIME_read_PKCS7.3,v 1.5 2017/01/06 02:37:05 schwarze Exp $
+.\"     $OpenBSD: SMIME_read_PKCS7.3,v 1.6 2018/03/22 16:06:33 schwarze Exp $
 .\"     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: January 6 2017 $
+.Dd $Mdocdate: March 22 2018 $
 .Dt SMIME_READ_PKCS7 3
 .Os
 .Sh NAME
@@ -129,7 +129,8 @@ The error can be obtained from
 .Xr SMIME_write_PKCS7 3
 .Sh HISTORY
 .Fn SMIME_read_PKCS7
-was added to OpenSSL 0.9.5.
+first appeared in OpenSSL 0.9.5 and has been available since
+.Ox 2.7 .
 .Sh BUGS
 The MIME parser used by
 .Fn SMIME_read_PKCS7
diff --git a/src/lib/libcrypto/man/SMIME_write_PKCS7.3 b/src/lib/libcrypto/man/SMIME_write_PKCS7.3
index a6cff4e76e..a0a15763a1 100644
--- a/src/lib/libcrypto/man/SMIME_write_PKCS7.3
+++ b/src/lib/libcrypto/man/SMIME_write_PKCS7.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: SMIME_write_PKCS7.3,v 1.4 2016/12/13 15:00:22 schwarze Exp $
+.\"     $OpenBSD: SMIME_write_PKCS7.3,v 1.5 2018/03/22 16:06:33 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: December 13 2016 $
+.Dd $Mdocdate: March 22 2018 $
 .Dt SMIME_WRITE_PKCS7 3
 .Os
 .Sh NAME
@@ -137,7 +137,8 @@ returns 1 for success or 0 for failure.
 .Xr SMIME_read_PKCS7 3
 .Sh HISTORY
 .Fn SMIME_write_PKCS7
-was added to OpenSSL 0.9.5.
+first appeared in OpenSSL 0.9.5 and has been available since
+.Ox 2.7 .
 .Sh BUGS
 .Fn SMIME_write_PKCS7
 always base64 encodes PKCS#7 structures.
diff --git a/src/lib/libcrypto/man/X509V3_get_d2i.3 b/src/lib/libcrypto/man/X509V3_get_d2i.3
index 86aebb6ec2..391e9c40a3 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.11 2018/03/21 17:57:48 schwarze Exp $
+.\" $OpenBSD: X509V3_get_d2i.3,v 1.12 2018/03/22 16:06:33 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 21 2018 $
+.Dd $Mdocdate: March 22 2018 $
 .Dt X509V3_GET_D2I 3
 .Os
 .Sh NAME
@@ -412,3 +412,11 @@ first appeared in OpenSSL 0.9.2b.
 first appeared in OpenSSL 0.9.3.
 Both functions have been available since
 .Ox 2.6 .
+.Pp
+.Fn X509V3_get_d2i ,
+.Fn X509_get_ext_d2i ,
+.Fn X509_CRL_get_ext_d2i ,
+and
+.Fn X509_REVOKED_get_ext_d2i
+first appeared in OpenSSL 0.9.5 and have been available since
+.Ox 2.7 .
diff --git a/src/lib/libcrypto/man/X509_CINF_new.3 b/src/lib/libcrypto/man/X509_CINF_new.3
index b22cf32224..eb18d66ffc 100644
--- a/src/lib/libcrypto/man/X509_CINF_new.3
+++ b/src/lib/libcrypto/man/X509_CINF_new.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: X509_CINF_new.3,v 1.3 2018/03/21 03:16:08 schwarze Exp $
+.\"     $OpenBSD: X509_CINF_new.3,v 1.4 2018/03/22 16:06:33 schwarze Exp $
 .\"
 .\" Copyright (c) 2016 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 22 2018 $
 .Dt X509_CINF_NEW 3
 .Os
 .Sh NAME
@@ -105,3 +105,9 @@ and
 .Fn X509_VAL_free
 appeared before SSLeay 0.8 and have been available since
 .Ox 2.4 .
+.Pp
+.Fn X509_CERT_AUX_new
+and
+.Fn X509_CERT_AUX_free
+first appeared in OpenSSL 0.9.5 and have been available since
+.Ox 2.7 .
diff --git a/src/lib/libcrypto/man/X509_LOOKUP_hash_dir.3 b/src/lib/libcrypto/man/X509_LOOKUP_hash_dir.3
index 00024dd4c6..61924eb5d8 100644
--- a/src/lib/libcrypto/man/X509_LOOKUP_hash_dir.3
+++ b/src/lib/libcrypto/man/X509_LOOKUP_hash_dir.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: X509_LOOKUP_hash_dir.3,v 1.6 2018/03/21 07:41:44 schwarze Exp $
+.\" $OpenBSD: X509_LOOKUP_hash_dir.3,v 1.7 2018/03/22 16:06:33 schwarze Exp $
 .\" full merge up to: OpenSSL 61f805c1 Jan 16 01:01:46 2018 +0800
 .\"
 .\" This file was written by Victor B. Wagner <vitus@cryptocom.ru>
@@ -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 22 2018 $
 .Dt X509_LOOKUP_HASH_DIR 3
 .Os
 .Sh NAME
@@ -238,3 +238,7 @@ appeared before SSLeay 0.8.
 first appeared in SSLeay 0.9.0.
 These functions have been available since
 .Ox 2.4 .
+.Pp
+.Fn X509_load_cert_crl_file
+first appeared in OpenSSL 0.9.5 and has been available since
+.Ox 2.7 .
diff --git a/src/lib/libcrypto/man/X509_NAME_ENTRY_get_object.3 b/src/lib/libcrypto/man/X509_NAME_ENTRY_get_object.3
index 31eca6b68e..49ce32ec11 100644
--- a/src/lib/libcrypto/man/X509_NAME_ENTRY_get_object.3
+++ b/src/lib/libcrypto/man/X509_NAME_ENTRY_get_object.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: X509_NAME_ENTRY_get_object.3,v 1.8 2018/03/21 03:16:08 schwarze Exp $
+.\" $OpenBSD: X509_NAME_ENTRY_get_object.3,v 1.9 2018/03/22 16:06:33 schwarze Exp $
 .\" full merge up to: OpenSSL aebb9aac Jul 19 09:27:53 2016 -0400
 .\" selective merge up to: OpenSSL 61f805c1 Jan 16 01:01:46 2018 +0800
 .\"
@@ -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 22 2018 $
 .Dt X509_NAME_ENTRY_GET_OBJECT 3
 .Os
 .Sh NAME
@@ -277,3 +277,7 @@ and
 .Fn X509_NAME_ENTRY_create_by_OBJ
 appeared before SSLeay 0.8 and have been available since
 .Ox 2.4 .
+.Pp
+.Fn X509_NAME_ENTRY_create_by_txt
+first appeared in OpenSSL 0.9.5 and has been available since
+.Ox 2.7 .
diff --git a/src/lib/libcrypto/man/X509_NAME_add_entry_by_txt.3 b/src/lib/libcrypto/man/X509_NAME_add_entry_by_txt.3
index 9e37b71474..c70c7b73d5 100644
--- a/src/lib/libcrypto/man/X509_NAME_add_entry_by_txt.3
+++ b/src/lib/libcrypto/man/X509_NAME_add_entry_by_txt.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: X509_NAME_add_entry_by_txt.3,v 1.8 2018/03/21 03:16:08 schwarze Exp $
+.\"     $OpenBSD: X509_NAME_add_entry_by_txt.3,v 1.9 2018/03/22 16:06:33 schwarze Exp $
 .\"     OpenSSL aebb9aac Jul 19 09:27:53 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 21 2018 $
+.Dd $Mdocdate: March 22 2018 $
 .Dt X509_NAME_ADD_ENTRY_BY_TXT 3
 .Os
 .Sh NAME
@@ -261,6 +261,13 @@ and
 .Fn X509_NAME_delete_entry
 appeared before SSLeay 0.8 and have been available since
 .Ox 2.4 .
+.Pp
+.Fn X509_NAME_add_entry_by_txt ,
+.Fn X509_NAME_add_entry_by_OBJ ,
+and
+.Fn X509_NAME_add_entry_by_NID
+first appeared in OpenSSL 0.9.5 and have been available since
+.Ox 2.7 .
 .Sh BUGS
 .Fa type
 can still be set to
diff --git a/src/lib/libcrypto/man/X509_PUBKEY_new.3 b/src/lib/libcrypto/man/X509_PUBKEY_new.3
index 11b79a5f0a..021542e911 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.8 2018/03/21 03:16:08 schwarze Exp $
+.\" $OpenBSD: X509_PUBKEY_new.3,v 1.9 2018/03/22 16:06:33 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: March 21 2018 $
+.Dd $Mdocdate: March 22 2018 $
 .Dt X509_PUBKEY_NEW 3
 .Os
 .Sh NAME
@@ -290,3 +290,9 @@ and
 .Fn X509_PUBKEY_get
 appeared before SSLeay 0.8 and have been available since
 .Ox 2.4 .
+.Pp
+.Fn d2i_PUBKEY
+and
+.Fn i2d_PUBKEY
+first appeared in OpenSSL 0.9.5 and have been available since
+.Ox 2.7 .
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 e7501fff4a..f510a40180 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.8 2018/03/21 03:16:08 schwarze Exp $
+.\" $OpenBSD: X509_STORE_CTX_get_error.3,v 1.9 2018/03/22 16:06:33 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 21 2018 $
+.Dd $Mdocdate: March 22 2018 $
 .Dt X509_STORE_CTX_GET_ERROR 3
 .Os
 .Sh NAME
@@ -383,3 +383,7 @@ and
 .Fn X509_verify_cert_error_string
 appeared before SSLeay 0.8 and have been available since
 .Ox 2.4 .
+.Pp
+.Fn X509_STORE_CTX_get1_chain
+first appeared in OpenSSL 0.9.5 and has been available since
+.Ox 2.7 .
diff --git a/src/lib/libcrypto/man/X509_STORE_CTX_new.3 b/src/lib/libcrypto/man/X509_STORE_CTX_new.3
index 7e50b1b402..c14db5e44f 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.12 2018/03/21 03:28:40 schwarze Exp $
+.\" $OpenBSD: X509_STORE_CTX_new.3,v 1.13 2018/03/22 16:06:33 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
 .\"
@@ -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 22 2018 $
 .Dt X509_STORE_CTX_NEW 3
 .Os
 .Sh NAME
@@ -330,6 +330,12 @@ and
 appeared before SSLeay 0.8 and have been available since
 .Ox 2.4 .
 .Pp
+.Fn X509_STORE_CTX_new
+and
+.Fn X509_STORE_CTX_free
+first appeared in OpenSSL 0.9.5 and have been available since
+.Ox 2.7 .
+.Pp
 .Fn X509_STORE_CTX_set0_crls
 was first added to OpenSSL 1.0.0.
 .Sh BUGS
diff --git a/src/lib/libcrypto/man/d2i_ASN1_NULL.3 b/src/lib/libcrypto/man/d2i_ASN1_NULL.3
index 8efcee69f3..498f191a95 100644
--- a/src/lib/libcrypto/man/d2i_ASN1_NULL.3
+++ b/src/lib/libcrypto/man/d2i_ASN1_NULL.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: d2i_ASN1_NULL.3,v 1.1 2016/12/29 17:42:54 schwarze Exp $
+.\"     $OpenBSD: d2i_ASN1_NULL.3,v 1.2 2018/03/22 16:06:33 schwarze Exp $
 .\"
 .\" Copyright (c) 2016 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: December 29 2016 $
+.Dd $Mdocdate: March 22 2018 $
 .Dt D2I_ASN1_NULL 3
 .Os
 .Sh NAME
@@ -82,3 +82,9 @@ Information technology - ASN.1 encoding rules:
 Specification of Basic Encoding Rules (BER), Canonical Encoding
 Rules (CER) and Distinguished Encoding Rules (DER),
 section 8.8: Encoding of null value
+.Sh HISTORY
+.Fn d2i_ASN1_NULL
+and
+.Fn i2d_ASN1_NULL
+first appeared in OpenSSL 0.9.5 and have been available since
+.Ox 2.7 .
diff --git a/src/lib/libcrypto/man/d2i_ASN1_OCTET_STRING.3 b/src/lib/libcrypto/man/d2i_ASN1_OCTET_STRING.3
index 8154b1352e..e8a17ebb1d 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.9 2018/03/21 17:57:48 schwarze Exp $
+.\"     $OpenBSD: d2i_ASN1_OCTET_STRING.3,v 1.10 2018/03/22 16:06:33 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 21 2018 $
+.Dd $Mdocdate: March 22 2018 $
 .Dt D2I_ASN1_OCTET_STRING 3
 .Os
 .Sh NAME
@@ -428,3 +428,7 @@ and
 first appeared in OpenSSL 0.9.3.
 These functions have been available since
 .Ox 2.6 .
+.Pp
+.Fn i2d_ASN1_PRINTABLESTRING
+first appeared in OpenSSL 0.9.5 and has been available since
+.Ox 2.7 .
diff --git a/src/lib/libcrypto/man/d2i_DIST_POINT.3 b/src/lib/libcrypto/man/d2i_DIST_POINT.3
index 4eb45d71da..9b25815a1a 100644
--- a/src/lib/libcrypto/man/d2i_DIST_POINT.3
+++ b/src/lib/libcrypto/man/d2i_DIST_POINT.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: d2i_DIST_POINT.3,v 1.2 2018/03/21 17:57:48 schwarze Exp $
+.\"     $OpenBSD: d2i_DIST_POINT.3,v 1.3 2018/03/22 16:06:33 schwarze Exp $
 .\"
 .\" Copyright (c) 2016 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 22 2018 $
 .Dt D2I_DIST_POINT 3
 .Os
 .Sh NAME
@@ -185,3 +185,11 @@ and
 .Fn i2d_DIST_POINT_NAME
 first appeared in OpenSSL 0.9.3 and have been available since
 .Ox 2.6 .
+.Pp
+.Fn d2i_ACCESS_DESCRIPTION ,
+.Fn i2d_ACCESS_DESCRIPTION ,
+.Fn d2i_AUTHORITY_INFO_ACCESS ,
+and
+.Fn i2d_AUTHORITY_INFO_ACCESS
+first appeared in OpenSSL 0.9.5 and have been available since
+.Ox 2.7 .
diff --git a/src/lib/libcrypto/man/d2i_DSAPublicKey.3 b/src/lib/libcrypto/man/d2i_DSAPublicKey.3
index 0212c570b0..103954c924 100644
--- a/src/lib/libcrypto/man/d2i_DSAPublicKey.3
+++ b/src/lib/libcrypto/man/d2i_DSAPublicKey.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: d2i_DSAPublicKey.3,v 1.11 2018/03/21 17:57:48 schwarze Exp $
+.\"     $OpenBSD: d2i_DSAPublicKey.3,v 1.12 2018/03/22 16:06:33 schwarze Exp $
 .\"     OpenSSL bb9ad09e Jun 6 00:43:05 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 21 2018 $
+.Dd $Mdocdate: March 22 2018 $
 .Dt D2I_DSAPUBLICKEY 3
 .Os
 .Sh NAME
@@ -355,3 +355,13 @@ and
 .Fn i2d_DSA_SIG
 first appeared in OpenSSL 0.9.3 and have been available since
 .Ox 2.6 .
+.Pp
+.Fn d2i_DSA_PUBKEY ,
+.Fn i2d_DSA_PUBKEY ,
+.Fn d2i_DSA_PUBKEY_bio ,
+.Fn d2i_DSA_PUBKEY_fp ,
+.Fn i2d_DSA_PUBKEY_bio ,
+and
+.Fn i2d_DSA_PUBKEY_fp
+first appeared in OpenSSL 0.9.5 and have been available since
+.Ox 2.7 .
diff --git a/src/lib/libcrypto/man/d2i_GENERAL_NAME.3 b/src/lib/libcrypto/man/d2i_GENERAL_NAME.3
index 56e2878a73..ee593fd460 100644
--- a/src/lib/libcrypto/man/d2i_GENERAL_NAME.3
+++ b/src/lib/libcrypto/man/d2i_GENERAL_NAME.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: d2i_GENERAL_NAME.3,v 1.2 2018/03/21 16:09:51 schwarze Exp $
+.\"     $OpenBSD: d2i_GENERAL_NAME.3,v 1.3 2018/03/22 16:06:33 schwarze Exp $
 .\"
 .\" Copyright (c) 2016 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 22 2018 $
 .Dt D2I_GENERAL_NAME 3
 .Os
 .Sh NAME
@@ -146,3 +146,9 @@ and
 .Fn i2d_GENERAL_NAMES
 first appeared in OpenSSL 0.9.2b and have been available since
 .Ox 2.6 .
+.Pp
+.Fn d2i_OTHERNAME
+and
+.Fn i2d_OTHERNAME
+first appeared in OpenSSL 0.9.5 and have been available since
+.Ox 2.7 .
diff --git a/src/lib/libcrypto/man/d2i_PKCS8PrivateKey_bio.3 b/src/lib/libcrypto/man/d2i_PKCS8PrivateKey_bio.3
index 8539f86030..9ac275e2a6 100644
--- a/src/lib/libcrypto/man/d2i_PKCS8PrivateKey_bio.3
+++ b/src/lib/libcrypto/man/d2i_PKCS8PrivateKey_bio.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: d2i_PKCS8PrivateKey_bio.3,v 1.9 2018/02/16 17:54:23 schwarze Exp $
+.\" $OpenBSD: d2i_PKCS8PrivateKey_bio.3,v 1.10 2018/03/22 16:06:33 schwarze Exp $
 .\" full merge up to: OpenSSL 61f805c1 Jan 16 01:01:46 2018 +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: February 16 2018 $
+.Dd $Mdocdate: March 22 2018 $
 .Dt D2I_PKCS8PRIVATEKEY_BIO 3
 .Os
 .Sh NAME
@@ -164,6 +164,10 @@ return 1 on success or 0 on error.
 .Xr d2i_X509_SIG 3 ,
 .Xr PEM_write_PKCS8PrivateKey 3 ,
 .Xr PKCS8_PRIV_KEY_INFO_new 3
+.Sh HISTORY
+These functions first appeared in OpenSSL 0.9.5
+and have been available since
+.Ox 2.7 .
 .Sh CAVEATS
 Do not confuse these functions with
 .Xr i2d_PKCS8PrivateKeyInfo_bio 3
diff --git a/src/lib/libcrypto/man/d2i_PrivateKey.3 b/src/lib/libcrypto/man/d2i_PrivateKey.3
index a130ccba4f..7a2824bc57 100644
--- a/src/lib/libcrypto/man/d2i_PrivateKey.3
+++ b/src/lib/libcrypto/man/d2i_PrivateKey.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: d2i_PrivateKey.3,v 1.6 2018/03/20 23:56:07 schwarze Exp $
+.\"     $OpenBSD: d2i_PrivateKey.3,v 1.7 2018/03/22 16:06:33 schwarze Exp $
 .\"     OpenSSL b97fdb57 Nov 11 09:33:09 2016 +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: March 20 2018 $
+.Dd $Mdocdate: March 22 2018 $
 .Dt D2I_PRIVATEKEY 3
 .Os
 .Sh NAME
@@ -273,3 +273,14 @@ and
 .Fn i2d_PublicKey
 appeared in SSLeay 0.8.1b or earlier and have been available since
 .Ox 2.4 .
+.Pp
+.Fn d2i_AutoPrivateKey ,
+.Fn d2i_PrivateKey_bio ,
+.Fn i2d_PrivateKey_bio ,
+.Fn d2i_PrivateKey_fp ,
+.Fn i2d_PrivateKey_fp ,
+.Fn i2d_PKCS8PrivateKeyInfo_bio ,
+and
+.Fn i2d_PKCS8PrivateKeyInfo_fp
+first appeared in OpenSSL 0.9.5 and have been available since
+.Ox 2.7 .
diff --git a/src/lib/libcrypto/man/d2i_RSAPublicKey.3 b/src/lib/libcrypto/man/d2i_RSAPublicKey.3
index 27b4dcb5a1..b0103e8914 100644
--- a/src/lib/libcrypto/man/d2i_RSAPublicKey.3
+++ b/src/lib/libcrypto/man/d2i_RSAPublicKey.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: d2i_RSAPublicKey.3,v 1.10 2018/03/21 01:27:25 schwarze Exp $
+.\"     $OpenBSD: d2i_RSAPublicKey.3,v 1.11 2018/03/22 16:06:33 schwarze Exp $
 .\"     OpenSSL bb9ad09e Jun 6 00:43:05 2016 -0400
 .\"
 .\" This file is a derived work.
@@ -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 22 2018 $
 .Dt D2I_RSAPUBLICKEY 3
 .Os
 .Sh NAME
@@ -366,3 +366,13 @@ and
 .Fn i2d_RSAPrivateKey_fp
 appeared before SSLeay 0.8 and have been available since
 .Ox 2.4 .
+.Pp
+.Fn d2i_RSA_PUBKEY ,
+.Fn i2d_RSA_PUBKEY ,
+.Fn d2i_RSA_PUBKEY_bio ,
+.Fn d2i_RSA_PUBKEY_fp ,
+.Fn i2d_RSA_PUBKEY_bio ,
+and
+.Fn i2d_RSA_PUBKEY_fp
+first appeared in OpenSSL 0.9.5 and have been available since
+.Ox 2.7 .
diff --git a/src/lib/libcrypto/man/d2i_X509.3 b/src/lib/libcrypto/man/d2i_X509.3
index 95f2ef6a4f..9c80fcdb75 100644
--- a/src/lib/libcrypto/man/d2i_X509.3
+++ b/src/lib/libcrypto/man/d2i_X509.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: d2i_X509.3,v 1.7 2018/03/21 03:16:08 schwarze Exp $
+.\"     $OpenBSD: d2i_X509.3,v 1.8 2018/03/22 16:06:33 schwarze Exp $
 .\"     OpenSSL 94480b57 Sep 12 23:34:41 2009 +0000
 .\"
 .\" 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 21 2018 $
+.Dd $Mdocdate: March 22 2018 $
 .Dt D2I_X509 3
 .Os
 .Sh NAME
@@ -283,3 +283,11 @@ and
 .Fn i2d_X509_VAL
 appeared before SSLeay 0.8 and have been available since
 .Ox 2.4 .
+.Pp
+.Fn d2i_X509_AUX ,
+.Fn i2d_X509_AUX ,
+.Fn d2i_X509_CERT_AUX ,
+and
+.Fn i2d_X509_CERT_AUX
+first appeared in OpenSSL 0.9.5 and have been available since
+.Ox 2.7 .