5 files changed, 23 insertions, 67 deletions
diff --git a/lib/libcrypto/man/BIO_get_ex_new_index.3 b/lib/libcrypto/man/BIO_get_ex_new_index.3
index 98ff6ce5900..b4b9fa082e4 100644
--- a/lib/libcrypto/man/BIO_get_ex_new_index.3
+++ b/lib/libcrypto/man/BIO_get_ex_new_index.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: BIO_get_ex_new_index.3,v 1.2 2016/11/18 21:49:20 jmc Exp $
+.\"	$OpenBSD: BIO_get_ex_new_index.3,v 1.3 2017/01/06 20:35:23 schwarze Exp $
 .\"	OpenSSL b97fdb57 Nov 11 09:33:09 2016 +0100
 .\"
 .\" This file was written by Rich Salz <rsalz@akamai.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 18 2016 $
+.Dd $Mdocdate: January 6 2017 $
 .Dt BIO_GET_EX_NEW_INDEX 3
 .Os
 .Sh NAME
@@ -64,24 +64,12 @@
 .Nm X509_get_ex_new_index ,
 .Nm X509_set_ex_data ,
 .Nm X509_get_ex_data ,
-.Nm X509_STORE_CTX_get_ex_new_index ,
-.Nm X509_STORE_CTX_set_ex_data ,
-.Nm X509_STORE_CTX_get_ex_data ,
-.Nm DH_get_ex_new_index ,
-.Nm DH_set_ex_data ,
-.Nm DH_get_ex_data ,
-.Nm DSA_get_ex_new_index ,
-.Nm DSA_set_ex_data ,
-.Nm DSA_get_ex_data ,
 .Nm ECDH_get_ex_new_index ,
 .Nm ECDH_set_ex_data ,
 .Nm ECDH_get_ex_data ,
 .Nm ECDSA_get_ex_new_index ,
 .Nm ECDSA_set_ex_data ,
-.Nm ECDSA_get_ex_data ,
-.Nm RSA_get_ex_new_index ,
-.Nm RSA_set_ex_data ,
-.Nm RSA_get_ex_data
+.Nm ECDSA_get_ex_data
 .Nd application-specific data
 .Sh SYNOPSIS
 .In openssl/x509.h
@@ -132,4 +120,5 @@ with an offset into the opaque exdata part of the
 .Vt TYPE
 object.
 .Sh SEE ALSO
-.Xr CRYPTO_get_ex_new_index 3
+.Xr CRYPTO_get_ex_new_index 3 ,
+.Xr RSA_get_ex_new_index 3
diff --git a/lib/libcrypto/man/CRYPTO_set_ex_data.3 b/lib/libcrypto/man/CRYPTO_set_ex_data.3
index 35d6d5cea3f..0e96e22e4bb 100644
--- a/lib/libcrypto/man/CRYPTO_set_ex_data.3
+++ b/lib/libcrypto/man/CRYPTO_set_ex_data.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: CRYPTO_set_ex_data.3,v 1.6 2016/11/29 07:29:52 jmc Exp $
+.\"	$OpenBSD: CRYPTO_set_ex_data.3,v 1.7 2017/01/06 20:35:23 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: November 29 2016 $
+.Dd $Mdocdate: January 6 2017 $
 .Dt CRYPTO_SET_EX_DATA 3
 .Os
 .Sh NAME
@@ -385,9 +385,11 @@ should return 0 for failure and 1 for success.
 On failure an error code can be obtained from
 .Xr ERR_get_error 3 .
 .Sh SEE ALSO
+.Xr BIO_get_ex_new_index 3 ,
 .Xr DH_get_ex_new_index 3 ,
 .Xr DSA_get_ex_new_index 3 ,
-.Xr RSA_get_ex_new_index 3
+.Xr RSA_get_ex_new_index 3 ,
+.Xr X509_STORE_CTX_get_ex_new_index 3
 .Sh HISTORY
 .Fn CRYPTO_set_ex_data
 and
diff --git a/lib/libcrypto/man/ECDSA_SIG_new.3 b/lib/libcrypto/man/ECDSA_SIG_new.3
index c0dbb18fc07..da3d3fe0d10 100644
--- a/lib/libcrypto/man/ECDSA_SIG_new.3
+++ b/lib/libcrypto/man/ECDSA_SIG_new.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ECDSA_SIG_new.3,v 1.7 2016/12/11 14:22:43 schwarze Exp $
+.\"	$OpenBSD: ECDSA_SIG_new.3,v 1.8 2017/01/06 20:35:23 schwarze Exp $
 .\"	OpenSSL e6390aca Jul 21 10:06:03 2015 -0400
 .\"
 .\" This file was written by Nils Larsch <nils@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 11 2016 $
+.Dd $Mdocdate: January 6 2017 $
 .Dt ECDSA_SIG_NEW 3
 .Os
 .Sh NAME
@@ -67,10 +67,7 @@
 .Nm ECDSA_do_verify ,
 .Nm ECDSA_OpenSSL ,
 .Nm ECDSA_get_default_method ,
-.Nm ECDSA_get_ex_data ,
-.Nm ECDSA_get_ex_new_index ,
 .Nm ECDSA_set_default_method ,
-.Nm ECDSA_set_ex_data ,
 .Nm ECDSA_set_method
 .Nd Elliptic Curve Digital Signature Algorithm
 .Sh SYNOPSIS
@@ -163,30 +160,11 @@
 .Fo ECDSA_get_default_method
 .Fa void
 .Fc
-.Ft void*
-.Fo ECDSA_get_ex_data
-.Fa "EC_KEY *d"
-.Fa "int idx"
-.Fc
-.Ft int
-.Fo ECDSA_get_ex_new_index
-.Fa "long argl"
-.Fa "void *argp"
-.Fa "CRYPTO_EX_new *new_func"
-.Fa "CRYPTO_EX_dup *dup_func"
-.Fa "CRYPTO_EX_free *free_func"
-.Fc
 .Ft void
 .Fo ECDSA_set_default_method
 .Fa "const ECDSA_METHOD *meth"
 .Fc
 .Ft int
-.Fo ECDSA_set_ex_data
-.Fa "EC_KEY *d"
-.Fa "int idx"
-.Fa "void *arg"
-.Fc
-.Ft int
 .Fo ECDSA_set_method
 .Fa "EC_KEY *eckey"
 .Fa "const ECDSA_METHOD *meth"
@@ -462,6 +440,7 @@ if (ret == -1) {
 .Xr DSA_new 3 ,
 .Xr EC_GROUP_new 3 ,
 .Xr EC_KEY_new 3 ,
+.Xr ECDSA_set_ex_data 3 ,
 .Xr EVP_DigestSignInit 3 ,
 .Xr EVP_DigestVerifyInit 3 ,
 .Xr RSA_new 3
diff --git a/lib/libcrypto/man/RSA_get_ex_new_index.3 b/lib/libcrypto/man/RSA_get_ex_new_index.3
index 7bdd4be0537..b97be8fe396 100644
--- a/lib/libcrypto/man/RSA_get_ex_new_index.3
+++ b/lib/libcrypto/man/RSA_get_ex_new_index.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: RSA_get_ex_new_index.3,v 1.5 2016/12/11 12:21:48 schwarze Exp $
+.\"	$OpenBSD: RSA_get_ex_new_index.3,v 1.6 2017/01/06 20:35:23 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: December 11 2016 $
+.Dd $Mdocdate: January 6 2017 $
 .Dt RSA_GET_EX_NEW_INDEX 3
 .Os
 .Sh NAME
@@ -257,8 +257,12 @@ should return 0 for failure and 1 for success.
 On failure an error code can be obtained from
 .Xr ERR_get_error 3 .
 .Sh SEE ALSO
+.Xr BIO_set_ex_data 3 ,
 .Xr CRYPTO_set_ex_data 3 ,
-.Xr RSA_new 3
+.Xr DH_set_ex_data 3 ,
+.Xr DSA_set_ex_data 3 ,
+.Xr RSA_new 3 ,
+.Xr X509_STORE_CTX_set_ex_data 3
 .Sh HISTORY
 .Fn RSA_get_ex_new_index ,
 .Fn RSA_set_ex_data ,
diff --git a/lib/libcrypto/man/engine.3 b/lib/libcrypto/man/engine.3
index b3219f24f34..a8ef6a89516 100644
--- a/lib/libcrypto/man/engine.3
+++ b/lib/libcrypto/man/engine.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: engine.3,v 1.9 2016/12/11 12:21:48 schwarze Exp $
+.\"	$OpenBSD: engine.3,v 1.10 2017/01/06 20:35:23 schwarze Exp $
 .\"	OpenSSL a528d4f0 Oct 27 13:40:11 2015 -0400
 .\"
 .\" This file was written by Geoff Thorpe <geoff@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 11 2016 $
+.Dd $Mdocdate: January 6 2017 $
 .Dt ENGINE 3
 .Os
 .Sh NAME
@@ -301,25 +301,6 @@
 .Fa "const char *arg"
 .Fa "int cmd_optional"
 .Fc
-.Ft int
-.Fo ENGINE_set_ex_data
-.Fa "ENGINE *e"
-.Fa "int idx"
-.Fa "void *arg"
-.Fc
-.Ft void *
-.Fo ENGINE_get_ex_data
-.Fa "const ENGINE *e"
-.Fa "int idx"
-.Fc
-.Ft int
-.Fo ENGINE_get_ex_new_index
-.Fa "long argl"
-.Fa "void *argp"
-.Fa "CRYPTO_EX_new *new_func"
-.Fa "CRYPTO_EX_dup *dup_func"
-.Fa "CRYPTO_EX_free *free_func"
-.Fc
 .Ft ENGINE *
 .Fn ENGINE_new void
 .Ft int
@@ -1220,4 +1201,5 @@ extension).
 .Xr DH_new 3 ,
 .Xr DSA_new 3 ,
 .Xr ENGINE_add_conf_module 3 ,
+.Xr ENGINE_set_ex_data 3 ,
 .Xr RSA_new 3