2 files changed, 36 insertions, 8 deletions

diff --git a/src/lib/libcrypto/man/d2i_DHparams.3 b/src/lib/libcrypto/man/d2i_DHparams.3
index b345af68ab..f7cc238899 100644
--- a/src/lib/libcrypto/man/d2i_DHparams.3
+++ b/src/lib/libcrypto/man/d2i_DHparams.3
@@ -1,9 +1,10 @@
-.\"     $OpenBSD: d2i_DHparams.3,v 1.5 2016/12/10 22:22:59 schwarze Exp $
-.\"     OpenSSL 99d63d46 Oct 26 13:56:48 2016 -0400
+.\" $OpenBSD: d2i_DHparams.3,v 1.6 2018/02/16 17:54:23 schwarze Exp $
+.\" full merge up to: OpenSSL 61f805c1 Jan 16 01:01:46 2018 +0800
 .\"
 .\" This file was written by Ulf Moeller <ulf@openssl.org> and
 .\" Dr. Stephen Henson <steve@openssl.org>.
-.\" Copyright (c) 2000, 2002, 2015 The OpenSSL Project.  All rights reserved.
+.\" Copyright (c) 2000, 2002, 2015, 2017 The OpenSSL Project.
+.\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -49,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: December 10 2016 $
+.Dd $Mdocdate: February 16 2018 $
 .Dt D2I_DHPARAMS 3
 .Os
 .Sh NAME
@@ -76,6 +77,17 @@ They otherwise behave in a way similar to
 .Xr d2i_X509 3
 and
 .Xr i2d_X509 3 .
+.Sh RETURN VALUES
+.Fn d2i_DHparams
+returns a
+.Vt DH
+object or
+.Dv NULL
+if an error occurs.
+.Pp
+.Fn i2d_DHparams
+returns the number of bytes successfully encoded or a value <= 0
+if an error occurs.
 .Sh SEE ALSO
 .Xr d2i_X509 3 ,
 .Xr DH_new 3
diff --git a/src/lib/libcrypto/man/d2i_PKCS8PrivateKey_bio.3 b/src/lib/libcrypto/man/d2i_PKCS8PrivateKey_bio.3
index 1fe8503824..8539f86030 100644
--- a/src/lib/libcrypto/man/d2i_PKCS8PrivateKey_bio.3
+++ b/src/lib/libcrypto/man/d2i_PKCS8PrivateKey_bio.3
@@ -1,8 +1,8 @@
-.\"     $OpenBSD: d2i_PKCS8PrivateKey_bio.3,v 1.8 2017/01/07 17:27:15 schwarze Exp $
-.\"     OpenSSL 99d63d46 Oct 26 13:56:48 2016 -0400
+.\" $OpenBSD: d2i_PKCS8PrivateKey_bio.3,v 1.9 2018/02/16 17:54:23 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>.
-.\" Copyright (c) 2002, 2016 The OpenSSL Project.  All rights reserved.
+.\" Copyright (c) 2002, 2016, 2017 The OpenSSL Project.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -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 7 2017 $
+.Dd $Mdocdate: February 16 2018 $
 .Dt D2I_PKCS8PRIVATEKEY_BIO 3
 .Os
 .Sh NAME
@@ -144,6 +144,22 @@ by converting the buffers to memory BIOs;
 see
 .Xr BIO_s_mem 3
 for details.
+.Sh RETURN VALUES
+.Fn d2i_PKCS8PrivateKey_bio
+and
+.Fn d2i_PKCS8PrivateKey_fp
+return a
+.Vt EVP_PKEY
+object or
+.Dv NULL
+if an error occurs.
+.Pp
+.Fn i2d_PKCS8PrivateKey_bio ,
+.Fn i2d_PKCS8PrivateKey_fp ,
+.Fn i2d_PKCS8PrivateKey_nid_bio ,
+and
+.Fn i2d_PKCS8PrivateKey_nid_fp
+return 1 on success or 0 on error.
 .Sh SEE ALSO
 .Xr d2i_X509_SIG 3 ,
 .Xr PEM_write_PKCS8PrivateKey 3 ,