From: Richard Levitte <levitte@openssl.org>
Date: Tue, 31 Oct 2017 10:32:24 +0000 (+0100)
Subject: Fix EVP_PKEY_ASN1_METHOD manual
X-Git-Tag: OpenSSL_1_1_1-pre1~491
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=287f5551d920aa487fd32336652dd9aebcd98051;p=oweals%2Fopenssl.git

Fix EVP_PKEY_ASN1_METHOD manual

Missing names slipped through

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4629)
---

diff --git a/doc/man3/EVP_PKEY_ASN1_METHOD.pod b/doc/man3/EVP_PKEY_ASN1_METHOD.pod
index 88df5b9b77..2ebabd10af 100644
--- a/doc/man3/EVP_PKEY_ASN1_METHOD.pod
+++ b/doc/man3/EVP_PKEY_ASN1_METHOD.pod
@@ -3,6 +3,21 @@
 =head1 NAME
 
 EVP_PKEY_ASN1_METHOD,
+EVP_PKEY_asn1_new,
+EVP_PKEY_asn1_copy,
+EVP_PKEY_asn1_free,
+EVP_PKEY_asn1_add0,
+EVP_PKEY_asn1_add_alias,
+EVP_PKEY_asn1_set_public,
+EVP_PKEY_asn1_set_private,
+EVP_PKEY_asn1_set_param,
+EVP_PKEY_asn1_set_free,
+EVP_PKEY_asn1_set_ctrl,
+EVP_PKEY_asn1_set_item,
+EVP_PKEY_asn1_set_siginf,
+EVP_PKEY_asn1_set_check,
+EVP_PKEY_asn1_set_security_bits,
+EVP_PKEY_get0_asn1
 - manipulating and registering EVP_PKEY_ASN1_METHOD structure
 
 =head1 SYNOPSIS
@@ -243,17 +258,17 @@ item_sign() MUST return one of:
 
 error
 
-=item 1
+=item Z<>1
 
 item_sign() did everything, OpenSSL internals just needs to pass the
 signature length back.
 
-=item 2
+=item Z<>2
 
 item_sign() did nothing, OpenSSL internal standard routines are
 expected to continue with the default signature production.
 
-=item 3
+=item Z<>3
 
 item_sign() set the algorithm identifier B<algor1> and B<algor2>,
 OpenSSL internals should just sign using those algorithms.
@@ -268,12 +283,12 @@ item_verify() MUST return one of:
 
 error
 
-=item 1
+=item Z<>1
 
 item_sign() did everything, OpenSSL internals just needs to pass the
 signature length back.
 
-=item 2
+=item Z<>2
 
 item_sign() did nothing, OpenSSL internal standard routines are
 expected to continue with the default signature production.
diff --git a/util/private.num b/util/private.num
index 205efe335a..a6e89218c8 100644
--- a/util/private.num
+++ b/util/private.num
@@ -21,6 +21,7 @@ CRYPTO_EX_new                           datatype
 DTLS_timer_cb                           datatype
 EVP_PKEY_gen_cb                         datatype
 EVP_PKEY_METHOD                         datatype
+EVP_PKEY_ASN1_METHOD                    datatype
 GEN_SESSION_CB                          datatype
 OPENSSL_Applink                         external
 OSSL_STORE_CTX                          datatype