The branch master has been updated via 7b2bde500dfdad6628b15c5faa641d0f6602110e (commit) from a26c089ba3637a3283cc0e76ea9529e90d18ba0d (commit)
- Log ----------------------------------------------------------------- commit 7b2bde500dfdad6628b15c5faa641d0f6602110e Author: PW Hu <jlu....@foxmail.com> Date: Thu Oct 21 15:16:17 2021 +0800 doc: Fix some function signature errors Reviewed-by: Shane Lontis <shane.lon...@oracle.com> Reviewed-by: Tomas Mraz <to...@openssl.org> (Merged from https://github.com/openssl/openssl/pull/16874) ----------------------------------------------------------------------- Summary of changes: doc/man3/BN_rand.pod | 10 +++++----- doc/man3/DSA_set_method.pod | 2 +- doc/man3/SHA256_Init.pod | 10 +++++----- doc/man3/SSL_CTX_set_client_hello_cb.pod | 2 +- doc/man3/SSL_CTX_set_num_tickets.pod | 4 ++-- doc/man3/SSL_CTX_set_split_send_fragment.pod | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/doc/man3/BN_rand.pod b/doc/man3/BN_rand.pod index 06ee99d28e..c18d184177 100644 --- a/doc/man3/BN_rand.pod +++ b/doc/man3/BN_rand.pod @@ -19,20 +19,20 @@ BN_pseudo_rand_range unsigned int strength, BN_CTX *ctx); int BN_priv_rand(BIGNUM *rnd, int bits, int top, int bottom); - int BN_rand_range_ex(BIGNUM *rnd, BIGNUM *range, unsigned int strength, + int BN_rand_range_ex(BIGNUM *rnd, const BIGNUM *range, unsigned int strength, BN_CTX *ctx); - int BN_rand_range(BIGNUM *rnd, BIGNUM *range); + int BN_rand_range(BIGNUM *rnd, const BIGNUM *range); - int BN_priv_rand_range_ex(BIGNUM *rnd, BIGNUM *range, unsigned int strength, + int BN_priv_rand_range_ex(BIGNUM *rnd, const BIGNUM *range, unsigned int strength, BN_CTX *ctx); - int BN_priv_rand_range(BIGNUM *rnd, BIGNUM *range); + int BN_priv_rand_range(BIGNUM *rnd, const BIGNUM *range); Deprecated since OpenSSL 3.0, can be hidden entirely by defining OPENSSL_API_COMPAT with a suitable version value, see openssl_user_macros(7): int BN_pseudo_rand(BIGNUM *rnd, int bits, int top, int bottom); - int BN_pseudo_rand_range(BIGNUM *rnd, BIGNUM *range); + int BN_pseudo_rand_range(BIGNUM *rnd, const BIGNUM *range); =head1 DESCRIPTION diff --git a/doc/man3/DSA_set_method.pod b/doc/man3/DSA_set_method.pod index 0d5a0ff1c5..0981c84909 100644 --- a/doc/man3/DSA_set_method.pod +++ b/doc/man3/DSA_set_method.pod @@ -21,7 +21,7 @@ L<openssl_user_macros(7)>: DSA *DSA_new_method(ENGINE *engine); - DSA_METHOD *DSA_OpenSSL(void); + const DSA_METHOD *DSA_OpenSSL(void); =head1 DESCRIPTION diff --git a/doc/man3/SHA256_Init.pod b/doc/man3/SHA256_Init.pod index 924f44fd10..22c72aa884 100644 --- a/doc/man3/SHA256_Init.pod +++ b/doc/man3/SHA256_Init.pod @@ -11,11 +11,11 @@ SHA512_Final - Secure Hash Algorithm #include <openssl/sha.h> - unsigned char *SHA1(const void *data, size_t count, unsigned char *md_buf); - unsigned char *SHA224(const void *data, size_t count, unsigned char *md_buf); - unsigned char *SHA256(const void *data, size_t count, unsigned char *md_buf); - unsigned char *SHA384(const void *data, size_t count, unsigned char *md_buf); - unsigned char *SHA512(const void *data, size_t count, unsigned char *md_buf); + unsigned char *SHA1(const unsigned char *data, size_t count, unsigned char *md_buf); + unsigned char *SHA224(const unsigned char *data, size_t count, unsigned char *md_buf); + unsigned char *SHA256(const unsigned char *data, size_t count, unsigned char *md_buf); + unsigned char *SHA384(const unsigned char *data, size_t count, unsigned char *md_buf); + unsigned char *SHA512(const unsigned char *data, size_t count, unsigned char *md_buf); Deprecated since OpenSSL 3.0, can be hidden entirely by defining B<OPENSSL_API_COMPAT> with a suitable version value, see diff --git a/doc/man3/SSL_CTX_set_client_hello_cb.pod b/doc/man3/SSL_CTX_set_client_hello_cb.pod index f70b147fc5..f324647abc 100644 --- a/doc/man3/SSL_CTX_set_client_hello_cb.pod +++ b/doc/man3/SSL_CTX_set_client_hello_cb.pod @@ -18,7 +18,7 @@ SSL_CTX_set_client_hello_cb, SSL_client_hello_cb_fn, SSL_client_hello_isv2, SSL_ const unsigned char **out); int SSL_client_hello_get1_extensions_present(SSL *s, int **out, size_t *outlen); - int SSL_client_hello_get0_ext(SSL *s, int type, const unsigned char **out, + int SSL_client_hello_get0_ext(SSL *s, unsigned int type, const unsigned char **out, size_t *outlen); =head1 DESCRIPTION diff --git a/doc/man3/SSL_CTX_set_num_tickets.pod b/doc/man3/SSL_CTX_set_num_tickets.pod index 95ed719df7..0c7331bc6d 100644 --- a/doc/man3/SSL_CTX_set_num_tickets.pod +++ b/doc/man3/SSL_CTX_set_num_tickets.pod @@ -14,9 +14,9 @@ SSL_new_session_ticket #include <openssl/ssl.h> int SSL_set_num_tickets(SSL *s, size_t num_tickets); - size_t SSL_get_num_tickets(SSL *s); + size_t SSL_get_num_tickets(const SSL *s); int SSL_CTX_set_num_tickets(SSL_CTX *ctx, size_t num_tickets); - size_t SSL_CTX_get_num_tickets(SSL_CTX *ctx); + size_t SSL_CTX_get_num_tickets(const SSL_CTX *ctx); int SSL_new_session_ticket(SSL *s); =head1 DESCRIPTION diff --git a/doc/man3/SSL_CTX_set_split_send_fragment.pod b/doc/man3/SSL_CTX_set_split_send_fragment.pod index ece474b2eb..97ef0fde51 100644 --- a/doc/man3/SSL_CTX_set_split_send_fragment.pod +++ b/doc/man3/SSL_CTX_set_split_send_fragment.pod @@ -28,7 +28,7 @@ SSL_SESSION_get_max_fragment_length - Control fragment size settings and pipelin int SSL_CTX_set_tlsext_max_fragment_length(SSL_CTX *ctx, uint8_t mode); int SSL_set_tlsext_max_fragment_length(SSL *ssl, uint8_t mode); - uint8_t SSL_SESSION_get_max_fragment_length(SSL_SESSION *session); + uint8_t SSL_SESSION_get_max_fragment_length(const SSL_SESSION *session); =head1 DESCRIPTION