diff options
| author | Rich Salz <rsalz@openssl.org> | 2017-10-08 10:50:38 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2017-10-08 12:29:18 -0400 |
| commit | 24b0be11b061f36d30ccccdf9d34edf270be4c2f (patch) | |
| tree | 3ad83f7e9921910e175584a6ac2652d95613d64a | |
| parent | 32cd473392d20b70bf6f1272a873f47a71a9417b (diff) | |
Fix doc for i2d/d2i private/public key
Reviewed-by: Kurt Roeckx <kurt@roeckx.be>
(Merged from https://github.com/openssl/openssl/pull/4491)
| -rw-r--r-- | doc/man3/d2i_PrivateKey.pod | 8 | ||||
| -rw-r--r-- | 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 30caeebcb5..f5b4667acd 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 f50194868b..32f5b99d9e 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, |