3 files changed, 61 insertions, 4 deletions

diff --git a/src/lib/libcrypto/man/Makefile b/src/lib/libcrypto/man/Makefile
index 00460281c0..ff4607ac3d 100644
--- a/src/lib/libcrypto/man/Makefile
+++ b/src/lib/libcrypto/man/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.84 2016/12/17 14:51:09 schwarze Exp $
+# $OpenBSD: Makefile,v 1.85 2016/12/22 12:10:06 schwarze Exp $
 
 .include <bsd.own.mk>
 
@@ -150,6 +150,7 @@ MAN=	\
         PKCS7_sign.3 \
         PKCS7_sign_add_signer.3 \
         PKCS7_verify.3 \
+        PKCS8_PRIV_KEY_INFO_new.3 \
         RAND_add.3 \
         RAND_bytes.3 \
         RAND_load_file.3 \
diff --git a/src/lib/libcrypto/man/PKCS8_PRIV_KEY_INFO_new.3 b/src/lib/libcrypto/man/PKCS8_PRIV_KEY_INFO_new.3
new file mode 100644
index 0000000000..d522dab9f8
--- /dev/null
+++ b/src/lib/libcrypto/man/PKCS8_PRIV_KEY_INFO_new.3
@@ -0,0 +1,55 @@
+.\"     $OpenBSD: PKCS8_PRIV_KEY_INFO_new.3,v 1.1 2016/12/22 12:10:06 schwarze Exp $
+.\"
+.\" Copyright (c) 2016 Ingo Schwarze <schwarze@openbsd.org>
+.\"
+.\" Permission to use, copy, modify, and distribute this software for any
+.\" purpose with or without fee is hereby granted, provided that the above
+.\" copyright notice and this permission notice appear in all copies.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+.\" 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 22 2016 $
+.Dt PKCS8_PRIV_KEY_INFO_NEW 3
+.Os
+.Sh NAME
+.Nm PKCS8_PRIV_KEY_INFO_new ,
+.Nm PKCS8_PRIV_KEY_INFO_free
+.Nd PKCS#8 private key information
+.Sh SYNOPSIS
+.In openssl/x509.h
+.Ft PKCS8_PRIV_KEY_INFO *
+.Fn PKCS8_PRIV_KEY_INFO_new void
+.Ft void
+.Fn PKCS8_PRIV_KEY_INFO_free "PKCS8_PRIV_KEY_INFO *key"
+.Sh DESCRIPTION
+.Fn PKCS8_PRIV_KEY_INFO_new
+allocates and initializes an empty
+.Vt PKCS8_PRIV_KEY_INFO
+object, representing an ASN.1 PrivateKeyInfo structure
+defined in RFC 5208 section 5.
+It can hold a private key together with information about the
+algorithm to be used with it and optional attributes.
+.Pp
+.Fn PKCS8_PRIV_KEY_INFO_free
+frees
+.Fa key .
+.Sh RETURN VALUES
+.Fn PKCS8_PRIV_KEY_INFO_new
+returns the new
+.Vt PKCS8_PRIV_KEY_INFO
+object or
+.Dv NULL
+if an error occurs.
+.Sh SEE ALSO
+.Xr d2i_PKCS8PrivateKey_bio 3 ,
+.Xr PEM_read_PKCS8_PRIV_KEY_INFO 3 ,
+.Xr PKCS12_parse 3 ,
+.Xr X509_ATTRIBUTE_new 3
+.Sh STANDARDS
+RFC 5208: PKCS#8: Private-Key Information Syntax Specification
diff --git a/src/lib/libcrypto/man/d2i_PKCS8PrivateKey_bio.3 b/src/lib/libcrypto/man/d2i_PKCS8PrivateKey_bio.3
index 76295cdde1..be102ff3fe 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.5 2016/12/08 20:22:08 jmc Exp $
+.\"     $OpenBSD: d2i_PKCS8PrivateKey_bio.3,v 1.6 2016/12/22 12:10:06 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 8 2016 $
+.Dd $Mdocdate: December 22 2016 $
 .Dt D2I_PKCS8PRIVATEKEY_BIO 3
 .Os
 .Sh NAME
@@ -146,4 +146,5 @@ see
 for details.
 .Sh SEE ALSO
 .Xr BIO_new 3 ,
-.Xr PEM_read_PrivateKey 3
+.Xr PEM_read_PKCS8_PRIV_KEY_INFO 3 ,
+.Xr PKCS8_PRIV_KEY_INFO_new 3