diff options
| -rw-r--r-- | lib/libcrypto/man/X509_get_pubkey.3 | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/lib/libcrypto/man/X509_get_pubkey.3 b/lib/libcrypto/man/X509_get_pubkey.3 index 8948f5cfda3..e4e6ab0994c 100644 --- a/lib/libcrypto/man/X509_get_pubkey.3 +++ b/lib/libcrypto/man/X509_get_pubkey.3 @@ -1,5 +1,5 @@ -.\" $OpenBSD: X509_get_pubkey.3,v 1.1 2016/12/05 18:24:08 schwarze Exp $ -.\" OpenSSL e7fabc5e Sep 7 13:41:20 2015 +0100 +.\" $OpenBSD: X509_get_pubkey.3,v 1.2 2018/03/17 17:04:04 schwarze Exp $ +.\" 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) 2015 The OpenSSL Project. All rights reserved. @@ -48,11 +48,12 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED .\" OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: December 5 2016 $ +.Dd $Mdocdate: March 17 2018 $ .Dt X509_GET_PUBKEY 3 .Os .Sh NAME .Nm X509_get_pubkey , +.Nm X509_get0_pubkey , .Nm X509_set_pubkey , .Nm X509_get_X509_PUBKEY , .Nm X509_REQ_get_pubkey , @@ -64,6 +65,10 @@ .Fo X509_get_pubkey .Fa "X509 *x" .Fc +.Ft EVP_PKEY * +.Fo X509_get0_pubkey +.Fa "const X509 *x" +.Fc .Ft int .Fo X509_set_pubkey .Fa "X509 *x" @@ -90,6 +95,11 @@ If successful it returns the public key as an .Vt EVP_PKEY pointer with its reference count incremented: this means the returned key must be freed up after use. +.Fn X509_get0_pubkey +is similar except that it does not increment the reference count +of the returned +.Vt EVP_PKEY , +so it must not be freed up after use. .Pp .Fn X509_get_X509_PUBKEY returns an internal pointer to the @@ -122,6 +132,7 @@ Subsequent calls return the cached structure with its reference count incremented to improve performance. .Sh RETURN VALUES .Fn X509_get_pubkey , +.Fn X509_get0_pubkey , .Fn X509_get_X509_PUBKEY , and .Fn X509_REQ_get_pubkey |