1 files changed, 35 insertions, 6 deletions

diff --git a/src/lib/libcrypto/man/EVP_PKEY_set1_RSA.3 b/src/lib/libcrypto/man/EVP_PKEY_set1_RSA.3
index 851184ae3c..e897dacf68 100644
--- a/src/lib/libcrypto/man/EVP_PKEY_set1_RSA.3
+++ b/src/lib/libcrypto/man/EVP_PKEY_set1_RSA.3
@@ -1,5 +1,6 @@
-.\"     $OpenBSD: EVP_PKEY_set1_RSA.3,v 1.5 2016/12/11 12:21:48 schwarze Exp $
-.\"     OpenSSL 9b86974e Aug 17 15:21:33 2015 -0400
+.\" $OpenBSD: EVP_PKEY_set1_RSA.3,v 1.6 2018/02/17 16:59:48 schwarze Exp $
+.\" full merge up to: OpenSSL 9b86974e Aug 17 15:21:33 2015 -0400
+.\" selective merge up to: OpenSSL 99d63d46 Oct 26 13:56:48 2016 -0400
 .\"
 .\" This file was written by Dr. Stephen Henson <steve@openssl.org>.
 .\" Copyright (c) 2002, 2014, 2016 The OpenSSL Project.  All rights reserved.
@@ -48,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: February 17 2018 $
 .Dt EVP_PKEY_SET1_RSA 3
 .Os
 .Sh NAME
@@ -60,6 +61,9 @@
 .Nm EVP_PKEY_get1_DSA ,
 .Nm EVP_PKEY_get1_DH ,
 .Nm EVP_PKEY_get1_EC_KEY ,
+.Nm EVP_PKEY_get0_RSA ,
+.Nm EVP_PKEY_get0_DSA ,
+.Nm EVP_PKEY_get0_DH ,
 .Nm EVP_PKEY_assign_RSA ,
 .Nm EVP_PKEY_assign_DSA ,
 .Nm EVP_PKEY_assign_DH ,
@@ -106,6 +110,18 @@
 .Fo EVP_PKEY_get1_EC_KEY
 .Fa "EVP_PKEY *pkey"
 .Fc
+.Ft RSA *
+.Fo EVP_PKEY_get0_RSA
+.Fa "EVP_PKEY *pkey"
+.Fc
+.Ft DSA *
+.Fo EVP_PKEY_get0_DSA
+.Fa "EVP_PKEY *pkey"
+.Fc
+.Ft DH *
+.Fo EVP_PKEY_get0_DH
+.Fa "EVP_PKEY *pkey"
+.Fc
 .Ft int
 .Fo EVP_PKEY_assign_RSA
 .Fa "EVP_PKEY *pkey"
@@ -155,11 +171,18 @@ to
 and
 .Fn EVP_PKEY_get1_EC_KEY
 return the key referenced in
-.Fa pkey
-or
+.Fa pkey ,
+incrementing its reference count by 1, or
 .Dv NULL
 if the key is not of the correct type.
 .Pp
+.Fn EVP_PKEY_get0_RSA ,
+.Fn EVP_PKEY_get0_DSA ,
+and
+.Fn EVP_PKEY_get0_DH
+are identical except that they do not increment the reference count.
+Consequently, the returned key must not be freed by the caller.
+.Pp
 .Fn EVP_PKEY_assign_RSA ,
 .Fn EVP_PKEY_assign_DSA ,
 .Fn EVP_PKEY_assign_DH ,
@@ -235,8 +258,11 @@ return 1 for success or 0 for failure.
 .Fn EVP_PKEY_get1_RSA ,
 .Fn EVP_PKEY_get1_DSA ,
 .Fn EVP_PKEY_get1_DH ,
+.Fn EVP_PKEY_get1_EC_KEY ,
+.Fn EVP_PKEY_get0_RSA ,
+.Fn EVP_PKEY_get0_DSA ,
 and
-.Fn EVP_PKEY_get1_EC_KEY
+.Fn EVP_PKEY_get0_DH
 return the referenced key or
 .Dv NULL
 if an error occurred.
@@ -258,5 +284,8 @@ return a key type or
 .Dv EVP_PKEY_NONE )
 on error.
 .Sh SEE ALSO
+.Xr DH_new 3 ,
+.Xr DSA_new 3 ,
+.Xr EC_KEY_new 3 ,
 .Xr EVP_PKEY_new 3 ,
 .Xr RSA_new 3