import EVP_PKEY_meth_get_count.pod from OpenSSL, pruning the functions we

don't have, which implies renaming the file to EVP_PKEY_meth_get0_info.3

2 files changed, 75 insertions, 1 deletions

diff --git a/src/lib/libcrypto/man/EVP_PKEY_meth_get0_info.3 b/src/lib/libcrypto/man/EVP_PKEY_meth_get0_info.3
new file mode 100644
index 0000000000..a5d8ad92b3
--- /dev/null
+++ b/src/lib/libcrypto/man/EVP_PKEY_meth_get0_info.3
@@ -0,0 +1,73 @@
+.\"     $OpenBSD: EVP_PKEY_meth_get0_info.3,v 1.1 2017/08/20 19:21:20 schwarze Exp $
+.\"     OpenSSL EVP_PKEY_meth_get_count.pod 6a2da303 Aug 9 11:25:19 2017 -0400
+.\"     OpenSSL EVP_PKEY_meth_get_count.pod 48ed9c23 Jul 25 17:48:26 2017 +0100
+.\"
+.\" This file was written by Dr. Stephen Henson <steve@openssl.org>.
+.\" Copyright (c) 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
+.\" are met:
+.\"
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\"
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in
+.\"    the documentation and/or other materials provided with the
+.\"    distribution.
+.\"
+.\" 3. All advertising materials mentioning features or use of this
+.\"    software must display the following acknowledgment:
+.\"    "This product includes software developed by the OpenSSL Project
+.\"    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+.\"
+.\" 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+.\"    endorse or promote products derived from this software without
+.\"    prior written permission. For written permission, please contact
+.\"    openssl-core@openssl.org.
+.\"
+.\" 5. Products derived from this software may not be called "OpenSSL"
+.\"    nor may "OpenSSL" appear in their names without prior written
+.\"    permission of the OpenSSL Project.
+.\"
+.\" 6. Redistributions of any form whatsoever must retain the following
+.\"    acknowledgment:
+.\"    "This product includes software developed by the OpenSSL Project
+.\"    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+.\" EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+.\" ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+.\" SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+.\" LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+.\" STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+.\" OF THE POSSIBILITY OF SUCH DAMAGE.
+.\"
+.Dd $Mdocdate: August 20 2017 $
+.Dt EVP_PKEY_METH_GET0_INFO 3
+.Os
+.Sh NAME
+.Nm EVP_PKEY_meth_get0_info
+.Nd enumerate public key methods
+.Sh SYNOPSIS
+.In openssl/evp.h
+.Ft void
+.Fo EVP_PKEY_meth_get0_info
+.Fa "int *ppkey_id"
+.Fa "int *pflags"
+.Fa "const EVP_PKEY_METHOD *meth"
+.Fc
+.Sh DESCRIPTION
+The function
+.Fn EVP_PKEY_meth_get0_info
+retrieves the public key ID (a NID) and any flags associated with the
+public key method
+.Pf * Fa meth .
+.Sh SEE ALSO
+.Xr EVP_PKEY_new 3
diff --git a/src/lib/libcrypto/man/Makefile b/src/lib/libcrypto/man/Makefile
index cd14bdcdb3..733e6730ab 100644
--- a/src/lib/libcrypto/man/Makefile
+++ b/src/lib/libcrypto/man/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.121 2017/08/20 15:01:20 schwarze Exp $
+# $OpenBSD: Makefile,v 1.122 2017/08/20 19:21:20 schwarze Exp $
 
 .include <bsd.own.mk>
 
@@ -121,6 +121,7 @@ MAN=	\
         EVP_PKEY_encrypt.3 \
         EVP_PKEY_get_default_digest_nid.3 \
         EVP_PKEY_keygen.3 \
+        EVP_PKEY_meth_get0_info.3 \
         EVP_PKEY_new.3 \
         EVP_PKEY_print_private.3 \
         EVP_PKEY_set1_RSA.3 \