From a6e3725b6c37b10a6cec8c610f05f5eacecb0927 Mon Sep 17 00:00:00 2001 From: schwarze Date: Sat, 24 Feb 2018 17:11:20 +0000 Subject: [PATCH] In evp.h rev. 1.58 2018/02/20 18:05:28, tb@ provided EVP_PKEY_get0_EC_KEY(3). Merge the documentation from OpenSSL. --- lib/libcrypto/man/EVP_PKEY_set1_RSA.3 | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/lib/libcrypto/man/EVP_PKEY_set1_RSA.3 b/lib/libcrypto/man/EVP_PKEY_set1_RSA.3 index e897dacf685..4847309da08 100644 --- a/lib/libcrypto/man/EVP_PKEY_set1_RSA.3 +++ b/lib/libcrypto/man/EVP_PKEY_set1_RSA.3 @@ -1,9 +1,9 @@ -.\" $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 +.\" $OpenBSD: EVP_PKEY_set1_RSA.3,v 1.7 2018/02/24 17:11:20 schwarze Exp $ +.\" full merge up to: OpenSSL bb9ad09e Jun 6 00:43:05 2016 -0400 .\" selective merge up to: OpenSSL 99d63d46 Oct 26 13:56:48 2016 -0400 .\" .\" This file was written by Dr. Stephen Henson . -.\" Copyright (c) 2002, 2014, 2016 The OpenSSL Project. All rights reserved. +.\" Copyright (c) 2002, 2015, 2016 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 +49,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED .\" OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: February 17 2018 $ +.Dd $Mdocdate: February 24 2018 $ .Dt EVP_PKEY_SET1_RSA 3 .Os .Sh NAME @@ -64,6 +64,7 @@ .Nm EVP_PKEY_get0_RSA , .Nm EVP_PKEY_get0_DSA , .Nm EVP_PKEY_get0_DH , +.Nm EVP_PKEY_get0_EC_KEY , .Nm EVP_PKEY_assign_RSA , .Nm EVP_PKEY_assign_DSA , .Nm EVP_PKEY_assign_DH , @@ -122,6 +123,10 @@ .Fo EVP_PKEY_get0_DH .Fa "EVP_PKEY *pkey" .Fc +.Ft EC_KEY * +.Fo EVP_PKEY_get0_EC_KEY +.Fa "EVP_PKEY *pkey" +.Fc .Ft int .Fo EVP_PKEY_assign_RSA .Fa "EVP_PKEY *pkey" @@ -178,8 +183,9 @@ if the key is not of the correct type. .Pp .Fn EVP_PKEY_get0_RSA , .Fn EVP_PKEY_get0_DSA , +.Fn EVP_PKEY_get0_DH , and -.Fn EVP_PKEY_get0_DH +.Fn EVP_PKEY_get0_EC_KEY are identical except that they do not increment the reference count. Consequently, the returned key must not be freed by the caller. .Pp @@ -261,8 +267,9 @@ return 1 for success or 0 for failure. .Fn EVP_PKEY_get1_EC_KEY , .Fn EVP_PKEY_get0_RSA , .Fn EVP_PKEY_get0_DSA , +.Fn EVP_PKEY_get0_DH , and -.Fn EVP_PKEY_get0_DH +.Fn EVP_PKEY_get0_EC_KEY return the referenced key or .Dv NULL if an error occurred. -- 2.20.1