6 files changed, 29 insertions, 21 deletions
diff --git a/lib/libcrypto/man/BIO_ctrl.3 b/lib/libcrypto/man/BIO_ctrl.3
index 73ca11979dc..7d1c5da6003 100644
--- a/lib/libcrypto/man/BIO_ctrl.3
+++ b/lib/libcrypto/man/BIO_ctrl.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: BIO_ctrl.3,v 1.6 2016/12/06 14:45:08 schwarze Exp $
+.\"	$OpenBSD: BIO_ctrl.3,v 1.7 2017/08/01 14:57:03 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: December 6 2016 $
+.Dd $Mdocdate: August 1 2017 $
 .Dt BIO_CTRL 3
 .Os
 .Sh NAME
@@ -68,7 +68,8 @@
 .Nm BIO_ctrl_pending ,
 .Nm BIO_ctrl_wpending ,
 .Nm BIO_get_info_callback ,
-.Nm BIO_set_info_callback
+.Nm BIO_set_info_callback ,
+.Nm bio_info_cb
 .Nd BIO control operations
 .Sh SYNOPSIS
 .In openssl/bio.h
diff --git a/lib/libcrypto/man/EVP_PKEY_keygen.3 b/lib/libcrypto/man/EVP_PKEY_keygen.3
index c393c3ad2c5..a05e19f80e5 100644
--- a/lib/libcrypto/man/EVP_PKEY_keygen.3
+++ b/lib/libcrypto/man/EVP_PKEY_keygen.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: EVP_PKEY_keygen.3,v 1.5 2017/04/10 17:45:06 schwarze Exp $
+.\"	$OpenBSD: EVP_PKEY_keygen.3,v 1.6 2017/08/01 14:57:03 schwarze Exp $
 .\"	OpenSSL 99d63d466 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: April 10 2017 $
+.Dd $Mdocdate: August 1 2017 $
 .Dt EVP_PKEY_KEYGEN 3
 .Os
 .Sh NAME
@@ -56,6 +56,7 @@
 .Nm EVP_PKEY_keygen ,
 .Nm EVP_PKEY_paramgen_init ,
 .Nm EVP_PKEY_paramgen ,
+.Nm EVP_PKEY_gen_cb ,
 .Nm EVP_PKEY_CTX_set_cb ,
 .Nm EVP_PKEY_CTX_get_cb ,
 .Nm EVP_PKEY_CTX_get_keygen_info ,
diff --git a/lib/libcrypto/man/HMAC.3 b/lib/libcrypto/man/HMAC.3
index caa19c55e32..595d5ed5ceb 100644
--- a/lib/libcrypto/man/HMAC.3
+++ b/lib/libcrypto/man/HMAC.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: HMAC.3,v 1.6 2017/01/06 17:38:21 schwarze Exp $
+.\"	$OpenBSD: HMAC.3,v 1.7 2017/08/01 14:57:03 schwarze Exp $
 .\"	OpenSSL a528d4f0 Oct 27 13:40:11 2015 -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: January 6 2017 $
+.Dd $Mdocdate: August 1 2017 $
 .Dt HMAC 3
 .Os
 .Sh NAME
@@ -60,7 +60,10 @@
 .Nm HMAC_Update ,
 .Nm HMAC_Final ,
 .Nm HMAC_CTX_cleanup ,
-.Nm HMAC_cleanup
+.Nm HMAC_cleanup ,
+.Nm HMAC_CTX_copy ,
+.Nm HMAC_CTX_set_flags ,
+.Nm HMAC_size
 .Nd HMAC message authentication code
 .Sh SYNOPSIS
 .In openssl/hmac.h
diff --git a/lib/libcrypto/man/RSA_get_ex_new_index.3 b/lib/libcrypto/man/RSA_get_ex_new_index.3
index b97be8fe396..a5331e6ab14 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.6 2017/01/06 20:35:23 schwarze Exp $
+.\"	$OpenBSD: RSA_get_ex_new_index.3,v 1.7 2017/08/01 14:57:03 schwarze Exp $
 .\"	OpenSSL 35cb565a Nov 19 15:49:30 2015 -0500
 .\"
 .\" This file was written by Ulf Moeller <ulf@openssl.org> and
@@ -49,13 +49,16 @@
 .\" 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: August 1 2017 $
 .Dt RSA_GET_EX_NEW_INDEX 3
 .Os
 .Sh NAME
 .Nm RSA_get_ex_new_index ,
 .Nm RSA_set_ex_data ,
-.Nm RSA_get_ex_data
+.Nm RSA_get_ex_data ,
+.Nm CRYPTO_EX_new ,
+.Nm CRYPTO_EX_dup ,
+.Nm CRYPTO_EX_free
 .Nd add application specific data to RSA structures
 .Sh SYNOPSIS
 .In openssl/rsa.h
diff --git a/lib/libcrypto/man/d2i_ASN1_OCTET_STRING.3 b/lib/libcrypto/man/d2i_ASN1_OCTET_STRING.3
index d3a8ffea024..86ab27b342d 100644
--- a/lib/libcrypto/man/d2i_ASN1_OCTET_STRING.3
+++ b/lib/libcrypto/man/d2i_ASN1_OCTET_STRING.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: d2i_ASN1_OCTET_STRING.3,v 1.4 2017/01/07 08:46:13 jmc Exp $
+.\"	$OpenBSD: d2i_ASN1_OCTET_STRING.3,v 1.5 2017/08/01 14:57:03 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: January 7 2017 $
+.Dd $Mdocdate: August 1 2017 $
 .Dt D2I_ASN1_OCTET_STRING 3
 .Os
 .Sh NAME
@@ -53,8 +53,8 @@
 .Nm i2d_ASN1_GENERALIZEDTIME ,
 .Nm d2i_ASN1_UTCTIME ,
 .Nm i2d_ASN1_UTCTIME ,
-.Nm d2i_ASN1_TIME_new ,
-.Nm i2d_ASN1_TIME_new
+.Nm d2i_ASN1_TIME ,
+.Nm i2d_ASN1_TIME
 .Nd decode and encode ASN1_STRING objects
 .Sh SYNOPSIS
 .In openssl/asn1.h
diff --git a/lib/libcrypto/man/d2i_ECPKParameters.3 b/lib/libcrypto/man/d2i_ECPKParameters.3
index 51080d69185..6557d75d585 100644
--- a/lib/libcrypto/man/d2i_ECPKParameters.3
+++ b/lib/libcrypto/man/d2i_ECPKParameters.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: d2i_ECPKParameters.3,v 1.9 2016/12/25 18:39:35 schwarze Exp $
+.\"	$OpenBSD: d2i_ECPKParameters.3,v 1.10 2017/08/01 14:57:03 schwarze Exp $
 .\"	OpenSSL 05ea606a May 20 20:52:46 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: December 25 2016 $
+.Dd $Mdocdate: August 1 2017 $
 .Dt D2I_ECPKPARAMETERS 3
 .Os
 .Sh NAME
@@ -172,7 +172,7 @@
 .Fa "EC_KEY **val_out"
 .Fc
 .Ft int
-.Fo i2d_ECPKPrivateKey_fp
+.Fo i2d_ECPrivateKey_fp
 .Fa "FILE *out_fp"
 .Fa "EC_KEY *val_in"
 .Fc
@@ -237,7 +237,7 @@
 .Fa "EC_KEY **val_out"
 .Fc
 .Ft int
-.Fo i2d_ECPK_PUBKEY_fp
+.Fo i2d_EC_PUBKEY_fp
 .Fa "FILE *out_fp"
 .Fa "EC_KEY *val_in"
 .Fc
@@ -407,14 +407,14 @@ an error occurs.
 .Fn i2d_ECPKParameters_bio ,
 .Fn i2d_ECPKParameters_fp ,
 .Fn i2d_ECPrivateKey_bio ,
-.Fn i2d_ECPKPrivateKey_fp ,
+.Fn i2d_ECPrivateKey_fp ,
 .Fn ECPKParameters_print ,
 .Fn ECPKParameters_print_fp ,
 .Fn ECParameters_print ,
 .Fn ECParameters_print_fp ,
 .Fn i2d_EC_PUBKEY_bio ,
 and
-.Fn i2d_ECPK_PUBKEY_fp
+.Fn i2d_EC_PUBKEY_fp
 return 1 for success or 0 if an error occurs.
 .Sh SEE ALSO
 .Xr ASN1_item_d2i 3 ,