diff options
| author | Jakub Jelen <jjelen@redhat.com> | 2018-01-17 19:23:37 -0500 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2018-01-17 20:12:56 -0500 |
| commit | 9db6673e23ab47bb7ee1304c078125bff66141b7 (patch) | |
| tree | ceea986cb0351f92bfd1b37a26e4da8e219fae14 /doc | |
| parent | 825038d8c36075488922617e48fc4782afe871d1 (diff) | |
| download | openssl-new-9db6673e23ab47bb7ee1304c078125bff66141b7.tar.gz | |
doc: Bad prototypes of EVP_PKEY_CTX_new()
CLA: trivial
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4861)
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/man3/EVP_PKEY_decrypt.pod | 5 | ||||
| -rw-r--r-- | doc/man3/EVP_PKEY_derive.pod | 5 | ||||
| -rw-r--r-- | doc/man3/EVP_PKEY_keygen.pod | 5 | ||||
| -rw-r--r-- | doc/man3/EVP_PKEY_verify.pod | 2 | ||||
| -rw-r--r-- | doc/man3/EVP_PKEY_verify_recover.pod | 2 |
5 files changed, 11 insertions, 8 deletions
diff --git a/doc/man3/EVP_PKEY_decrypt.pod b/doc/man3/EVP_PKEY_decrypt.pod index 07eaa04f4b..a527580bf8 100644 --- a/doc/man3/EVP_PKEY_decrypt.pod +++ b/doc/man3/EVP_PKEY_decrypt.pod @@ -49,15 +49,16 @@ Decrypt data using OAEP (for RSA keys): #include <openssl/rsa.h> EVP_PKEY_CTX *ctx; + ENGINE *eng; unsigned char *out, *in; size_t outlen, inlen; EVP_PKEY *key; /* - * NB: assumes key in, inlen are already set up + * NB: assumes key, eng, in, inlen are already set up * and that key is an RSA private key */ - ctx = EVP_PKEY_CTX_new(key); + ctx = EVP_PKEY_CTX_new(key, eng); if (!ctx) /* Error occurred */ if (EVP_PKEY_decrypt_init(ctx) <= 0) diff --git a/doc/man3/EVP_PKEY_derive.pod b/doc/man3/EVP_PKEY_derive.pod index 3ee6bb322a..2aeb62e202 100644 --- a/doc/man3/EVP_PKEY_derive.pod +++ b/doc/man3/EVP_PKEY_derive.pod @@ -50,12 +50,13 @@ Derive shared secret (for example DH or EC keys): #include <openssl/rsa.h> EVP_PKEY_CTX *ctx; + ENGINE *eng; unsigned char *skey; size_t skeylen; EVP_PKEY *pkey, *peerkey; - /* NB: assumes pkey, peerkey have been already set up */ + /* NB: assumes pkey, eng, peerkey have been already set up */ - ctx = EVP_PKEY_CTX_new(pkey); + ctx = EVP_PKEY_CTX_new(pkey, eng); if (!ctx) /* Error occurred */ if (EVP_PKEY_derive_init(ctx) <= 0) diff --git a/doc/man3/EVP_PKEY_keygen.pod b/doc/man3/EVP_PKEY_keygen.pod index a18579c09a..3943a0283c 100644 --- a/doc/man3/EVP_PKEY_keygen.pod +++ b/doc/man3/EVP_PKEY_keygen.pod @@ -138,10 +138,11 @@ Generate a key from a set of parameters: #include <openssl/rsa.h> EVP_PKEY_CTX *ctx; + ENGINE *eng; EVP_PKEY *pkey = NULL, *param; - /* Assumed param is set up already */ - ctx = EVP_PKEY_CTX_new(param); + /* Assumed param, eng are set up already */ + ctx = EVP_PKEY_CTX_new(param, eng); if (!ctx) /* Error occurred */ if (EVP_PKEY_keygen_init(ctx) <= 0) diff --git a/doc/man3/EVP_PKEY_verify.pod b/doc/man3/EVP_PKEY_verify.pod index 4baf45c6e4..26167835ae 100644 --- a/doc/man3/EVP_PKEY_verify.pod +++ b/doc/man3/EVP_PKEY_verify.pod @@ -60,7 +60,7 @@ Verify signature using PKCS#1 and SHA256 digest: * NB: assumes verify_key, sig, siglen md and mdlen are already set up * and that verify_key is an RSA public key */ - ctx = EVP_PKEY_CTX_new(verify_key); + ctx = EVP_PKEY_CTX_new(verify_key, NULL /* no engine */); if (!ctx) /* Error occurred */ if (EVP_PKEY_verify_init(ctx) <= 0) diff --git a/doc/man3/EVP_PKEY_verify_recover.pod b/doc/man3/EVP_PKEY_verify_recover.pod index 830ec03035..80cc04a21e 100644 --- a/doc/man3/EVP_PKEY_verify_recover.pod +++ b/doc/man3/EVP_PKEY_verify_recover.pod @@ -65,7 +65,7 @@ Recover digest originally signed using PKCS#1 and SHA256 digest: * NB: assumes verify_key, sig and siglen are already set up * and that verify_key is an RSA public key */ - ctx = EVP_PKEY_CTX_new(verify_key); + ctx = EVP_PKEY_CTX_new(verify_key, NULL /* no engine */); if (!ctx) /* Error occurred */ if (EVP_PKEY_verify_recover_init(ctx) <= 0) |