2 files changed, 19 insertions, 8 deletions

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 891f8e9880..a0bed0ea1d 100644
--- a/src/lib/libcrypto/man/BIO_get_ex_new_index.3
+++ b/src/lib/libcrypto/man/BIO_get_ex_new_index.3
@@ -1,6 +1,5 @@
-.\" $OpenBSD: BIO_get_ex_new_index.3,v 1.11 2019/06/06 01:06:58 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
+.\" $OpenBSD: BIO_get_ex_new_index.3,v 1.12 2019/08/16 12:16:22 schwarze Exp $
+.\" full merge up to: OpenSSL 61f805c1 Jan 16 01:01:46 2018 +0800
 .\"
 .\" This file was written by Rich Salz <rsalz@akamai.com>.
 .\" Copyright (c) 2015, 2016 The OpenSSL Project.  All rights reserved.
@@ -49,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: June 6 2019 $
+.Dd $Mdocdate: August 16 2019 $
 .Dt BIO_GET_EX_NEW_INDEX 3
 .Os
 .Sh NAME
@@ -65,6 +64,9 @@
 .Nm X509_get_ex_new_index ,
 .Nm X509_set_ex_data ,
 .Nm X509_get_ex_data ,
+.Nm EC_KEY_get_ex_new_index ,
+.Nm EC_KEY_get_ex_data ,
+.Nm EC_KEY_set_ex_data ,
 .Nm ECDH_get_ex_new_index ,
 .Nm ECDH_set_ex_data ,
 .Nm ECDH_get_ex_data ,
@@ -77,6 +79,7 @@
 .In openssl/engine.h
 .In openssl/ui.h
 .In openssl/x509.h
+.In openssl/ec.h
 .In openssl/ecdh.h
 .In openssl/ecdsa.h
 .Ft int
@@ -180,3 +183,10 @@ and
 .Fn ECDSA_get_ex_data
 first appeared in OpenSSL 0.9.8 and have been available since
 .Ox 4.5 .
+.Pp
+.Fn EC_KEY_get_ex_new_index ,
+.Fn EC_KEY_set_ex_data ,
+and
+.Fn EC_KEY_get_ex_data
+first appeared in OpenSSL 1.1.0 and have been available since
+.Ox 6.5 .
diff --git a/src/lib/libcrypto/man/CRYPTO_set_ex_data.3 b/src/lib/libcrypto/man/CRYPTO_set_ex_data.3
index c2990f5a07..c78076b8a8 100644
--- a/src/lib/libcrypto/man/CRYPTO_set_ex_data.3
+++ b/src/lib/libcrypto/man/CRYPTO_set_ex_data.3
@@ -1,7 +1,7 @@
-.\" $OpenBSD: CRYPTO_set_ex_data.3,v 1.11 2019/06/06 01:06:58 schwarze Exp $
+.\" $OpenBSD: CRYPTO_set_ex_data.3,v 1.12 2019/08/16 12:16:22 schwarze Exp $
 .\" full merge up to:
 .\" OpenSSL CRYPTO_get_ex_new_index 9e183d22 Mar 11 08:56:44 2017 -0500
-.\" selective merge up to: a73d990e Feb 27 19:02:24 2018 +0100
+.\" selective merge up to: 72a7a702 Feb 26 14:05:09 2019 +0000
 .\"
 .\" This file was written by Dr. Stephen Henson <steve@openssl.org>
 .\" and by Rich Salz <rsalz@akamai.com>.
@@ -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: June 6 2019 $
+.Dd $Mdocdate: August 16 2019 $
 .Dt CRYPTO_SET_EX_DATA 3
 .Os
 .Sh NAME
@@ -134,6 +134,7 @@ The specific structures are:
     BIO
     DH
     DSA
+    EC_KEY
     ECDH
     ECDSA
     ENGINE
@@ -214,7 +215,7 @@ The
 .Fa class_index
 identifies the structure type, the
 .Fa obj
-is be the pointer to the actual structure, and
+is a pointer to the actual structure, and
 .Fa r
 is a pointer to the structure's exdata field.
 .Pp