From 5c3f01ff1a94bdb0d32bbb08f69f34316eaa136c Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Mon, 9 Oct 2017 12:55:27 +0200 Subject: [PATCH] Correct some typedef documentation Reviewed-by: Matt Caswell Reviewed-by: Bernd Edlinger (Merged from https://github.com/openssl/openssl/pull/4499) (cherry picked from commit 5bf6d418034a246bd3680d648c22e2c4500a3e0a) --- doc/crypto/BIO_ctrl.pod | 4 ++-- doc/crypto/EVP_PKEY_keygen.pod | 2 +- doc/crypto/PEM_read_bio_PrivateKey.pod | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/crypto/BIO_ctrl.pod b/doc/crypto/BIO_ctrl.pod index a098946d53..70b3c3383d 100644 --- a/doc/crypto/BIO_ctrl.pod +++ b/doc/crypto/BIO_ctrl.pod @@ -12,10 +12,10 @@ BIO_get_info_callback, BIO_set_info_callback, bio_info_cb #include - typedef void (*bio_info_cb)(BIO *b, int oper, const char *ptr, int arg1, long arg2, long arg3); + typedef void bio_info_cb(BIO *b, int oper, const char *ptr, int arg1, long arg2, long arg3); long BIO_ctrl(BIO *bp, int cmd, long larg, void *parg); - long BIO_callback_ctrl(BIO *b, int cmd, bio_info_cb cb); + long BIO_callback_ctrl(BIO *b, int cmd, bio_info_cb *cb); char *BIO_ptr_ctrl(BIO *bp, int cmd, long larg); long BIO_int_ctrl(BIO *bp, int cmd, long larg, int iarg); diff --git a/doc/crypto/EVP_PKEY_keygen.pod b/doc/crypto/EVP_PKEY_keygen.pod index ed4a3e1db8..b1e708fc5b 100644 --- a/doc/crypto/EVP_PKEY_keygen.pod +++ b/doc/crypto/EVP_PKEY_keygen.pod @@ -18,7 +18,7 @@ EVP_PKEY_gen_cb int EVP_PKEY_paramgen_init(EVP_PKEY_CTX *ctx); int EVP_PKEY_paramgen(EVP_PKEY_CTX *ctx, EVP_PKEY **ppkey); - typedef int (*EVP_PKEY_gen_cb)(EVP_PKEY_CTX *ctx); + typedef int EVP_PKEY_gen_cb(EVP_PKEY_CTX *ctx); void EVP_PKEY_CTX_set_cb(EVP_PKEY_CTX *ctx, EVP_PKEY_gen_cb *cb); EVP_PKEY_gen_cb *EVP_PKEY_CTX_get_cb(EVP_PKEY_CTX *ctx); diff --git a/doc/crypto/PEM_read_bio_PrivateKey.pod b/doc/crypto/PEM_read_bio_PrivateKey.pod index fbfe975be0..6b3006ef35 100644 --- a/doc/crypto/PEM_read_bio_PrivateKey.pod +++ b/doc/crypto/PEM_read_bio_PrivateKey.pod @@ -30,7 +30,7 @@ PEM_write_bio_PKCS7, PEM_write_PKCS7 - PEM routines #include - typedef int (*pem_password_cb)(char *buf, int size, int rwflag, void *u); + typedef int pem_password_cb(char *buf, int size, int rwflag, void *u); EVP_PKEY *PEM_read_bio_PrivateKey(BIO *bp, EVP_PKEY **x, pem_password_cb *cb, void *u); -- 2.25.1