Commit 9db6673e authored by Jakub Jelen's avatar Jakub Jelen Committed by Rich Salz
Browse files

doc: Bad prototypes of EVP_PKEY_CTX_new() 



CLA: trivial

Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
Reviewed-by: default avatarTim Hudson <tjh@openssl.org>
Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4861)
parent 825038d8

doc/man3/EVP_PKEY_decrypt.pod

+3 −2
Original line number Diff line number Diff line
@@ -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)

doc/man3/EVP_PKEY_derive.pod

+3 −2
Original line number Diff line number Diff line
@@ -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)

doc/man3/EVP_PKEY_keygen.pod

+3 −2
Original line number Diff line number Diff line
@@ -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)

doc/man3/EVP_PKEY_verify.pod

+1 −1
Original line number Diff line number Diff line
@@ -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)

doc/man3/EVP_PKEY_verify_recover.pod

+1 −1
Original line number Diff line number Diff line
@@ -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)