[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  24b0be11b061f36d30ccccdf9d34edf270be4c2f (commit)
      from  32cd473392d20b70bf6f1272a873f47a71a9417b (commit)


- Log -----------------------------------------------------------------
commit 24b0be11b061f36d30ccccdf9d34edf270be4c2f
Author: Rich Salz <rsalz at openssl.org>
Date:   Sun Oct 8 10:50:38 2017 -0400

    Fix doc for i2d/d2i private/public key
    
    Reviewed-by: Kurt Roeckx <kurt at roeckx.be>
    (Merged from https://github.com/openssl/openssl/pull/4491)

-----------------------------------------------------------------------

Summary of changes:
 doc/man3/d2i_PrivateKey.pod | 8 +++++++-
 doc/man3/d2i_X509.pod       | 1 -
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/doc/man3/d2i_PrivateKey.pod b/doc/man3/d2i_PrivateKey.pod
index 30caeeb..f5b4667 100644
--- a/doc/man3/d2i_PrivateKey.pod
+++ b/doc/man3/d2i_PrivateKey.pod
@@ -2,7 +2,8 @@
 
 =head1 NAME
 
-d2i_PrivateKey, d2i_AutoPrivateKey, i2d_PrivateKey,
+d2i_PrivateKey, d2i_PublicKey, d2i_AutoPrivateKey,
+i2d_PrivateKey, i2d_PublicKey,
 d2i_PrivateKey_bio, d2i_PrivateKey_fp
 - decode and encode functions for reading and saving EVP_PKEY structures
 
@@ -12,9 +13,12 @@ d2i_PrivateKey_bio, d2i_PrivateKey_fp
 
  EVP_PKEY *d2i_PrivateKey(int type, EVP_PKEY **a, const unsigned char **pp,
                           long length);
+ EVP_PKEY *d2i_PublicKey(int type, EVP_PKEY **a, const unsigned char **pp,
+                         long length);
  EVP_PKEY *d2i_AutoPrivateKey(EVP_PKEY **a, const unsigned char **pp,
                               long length);
  int i2d_PrivateKey(EVP_PKEY *a, unsigned char **pp);
+ int i2d_PublicKey(EVP_PKEY *a, unsigned char **pp);
 
  EVP_PKEY *d2i_PrivateKey_bio(BIO *bp, EVP_PKEY **a);
  EVP_PKEY *d2i_PrivateKey_fp(FILE *fp, EVP_PKEY **a)
@@ -25,12 +29,14 @@ d2i_PrivateKey() decodes a private key using algorithm B<type>. It attempts to
 use any key specific format or PKCS#8 unencrypted PrivateKeyInfo format. The
 B<type> parameter should be a public key algorithm constant such as
 B<EVP_PKEY_RSA>. An error occurs if the decoded key does not match B<type>.
+d2i_PublicKey() does the same for public keys.
 
 d2i_AutoPrivateKey() is similar to d2i_PrivateKey() except it attempts to
 automatically detect the private key format.
 
 i2d_PrivateKey() encodes B<key>. It uses a key specific format or, if none is
 defined for that key type, PKCS#8 unencrypted PrivateKeyInfo format.
+i2d_PublicKey() does the same for public keys.
 
 These functions are similar to the d2i_X509() functions; see L<d2i_X509(3)>.
 
diff --git a/doc/man3/d2i_X509.pod b/doc/man3/d2i_X509.pod
index f501948..32f5b99 100644
--- a/doc/man3/d2i_X509.pod
+++ b/doc/man3/d2i_X509.pod
@@ -121,7 +121,6 @@ d2i_POLICYINFO,
 d2i_POLICYQUALINFO,
 d2i_PROXY_CERT_INFO_EXTENSION,
 d2i_PROXY_POLICY,
-d2i_PublicKey,
 d2i_RSAPrivateKey,
 d2i_RSAPrivateKey_bio,
 d2i_RSAPrivateKey_fp,