The branch master has been updated via 1e4cef5fde59e28f10ec555801349d06471d1da0 (commit) from d4dfd983e32b32b633aaa9edec422cc30419c6f7 (commit)
- Log ----------------------------------------------------------------- commit 1e4cef5fde59e28f10ec555801349d06471d1da0 Author: PW Hu <jlu....@foxmail.com> Date: Fri Oct 22 14:01:36 2021 +0800 doc: Fix some function signature errors Reviewed-by: Paul Dale <pa...@openssl.org> Reviewed-by: Tomas Mraz <to...@openssl.org> (Merged from https://github.com/openssl/openssl/pull/16897) ----------------------------------------------------------------------- Summary of changes: doc/man3/ASN1_INTEGER_get_int64.pod | 6 +++--- doc/man3/BIO_s_connect.pod | 2 +- doc/man3/BIO_set_callback.pod | 2 +- doc/man3/BN_mod_mul_reciprocal.pod | 4 ++-- doc/man3/CRYPTO_get_ex_new_index.pod | 2 +- doc/man3/OPENSSL_instrument_bus.pod | 4 ++-- doc/man3/OSSL_DECODER_CTX.pod | 4 +++- doc/man3/RSA_print.pod | 14 +++++++------- doc/man3/SSL_CIPHER_get_name.pod | 2 +- doc/man3/X509_get_pubkey.pod | 2 +- doc/man3/i2d_re_X509_tbs.pod | 2 +- 11 files changed, 23 insertions(+), 21 deletions(-) diff --git a/doc/man3/ASN1_INTEGER_get_int64.pod b/doc/man3/ASN1_INTEGER_get_int64.pod index 1d9ff25f84..4ba6c4c0d7 100644 --- a/doc/man3/ASN1_INTEGER_get_int64.pod +++ b/doc/man3/ASN1_INTEGER_get_int64.pod @@ -14,7 +14,7 @@ ASN1_INTEGER_get_int64, ASN1_INTEGER_get, ASN1_INTEGER_set_int64, ASN1_INTEGER_s long ASN1_INTEGER_get(const ASN1_INTEGER *a); int ASN1_INTEGER_set_int64(ASN1_INTEGER *a, int64_t r); - int ASN1_INTEGER_set(const ASN1_INTEGER *a, long v); + int ASN1_INTEGER_set(ASN1_INTEGER *a, long v); int ASN1_INTEGER_get_uint64(uint64_t *pr, const ASN1_INTEGER *a); int ASN1_INTEGER_set_uint64(ASN1_INTEGER *a, uint64_t r); @@ -28,8 +28,8 @@ ASN1_INTEGER_get_int64, ASN1_INTEGER_get, ASN1_INTEGER_set_int64, ASN1_INTEGER_s int ASN1_ENUMERATED_set_int64(ASN1_ENUMERATED *a, int64_t r); int ASN1_ENUMERATED_set(ASN1_ENUMERATED *a, long v); - ASN1_ENUMERATED *BN_to_ASN1_ENUMERATED(BIGNUM *bn, ASN1_ENUMERATED *ai); - BIGNUM *ASN1_ENUMERATED_to_BN(ASN1_ENUMERATED *ai, BIGNUM *bn); + ASN1_ENUMERATED *BN_to_ASN1_ENUMERATED(const BIGNUM *bn, ASN1_ENUMERATED *ai); + BIGNUM *ASN1_ENUMERATED_to_BN(const ASN1_ENUMERATED *ai, BIGNUM *bn); =head1 DESCRIPTION diff --git a/doc/man3/BIO_s_connect.pod b/doc/man3/BIO_s_connect.pod index 76ed7337ea..88450dffce 100644 --- a/doc/man3/BIO_s_connect.pod +++ b/doc/man3/BIO_s_connect.pod @@ -15,7 +15,7 @@ BIO_set_nbio, BIO_do_connect - connect BIO const BIO_METHOD *BIO_s_connect(void); - BIO *BIO_new_connect(char *name); + BIO *BIO_new_connect(const char *name); long BIO_set_conn_hostname(BIO *b, char *name); long BIO_set_conn_port(BIO *b, char *port); diff --git a/doc/man3/BIO_set_callback.pod b/doc/man3/BIO_set_callback.pod index dac94bfea3..157312bfaa 100644 --- a/doc/man3/BIO_set_callback.pod +++ b/doc/man3/BIO_set_callback.pod @@ -31,7 +31,7 @@ BIO_debug_callback_ex, BIO_callback_fn_ex, BIO_callback_fn typedef long (*BIO_callback_fn)(BIO *b, int oper, const char *argp, int argi, long argl, long ret); void BIO_set_callback(BIO *b, BIO_callback_fn cb); - BIO_callback_fn BIO_get_callback(BIO *b); + BIO_callback_fn BIO_get_callback(const BIO *b); long BIO_debug_callback(BIO *bio, int cmd, const char *argp, int argi, long argl, long ret); diff --git a/doc/man3/BN_mod_mul_reciprocal.pod b/doc/man3/BN_mod_mul_reciprocal.pod index dd3b0ee808..a2f4ebc79d 100644 --- a/doc/man3/BN_mod_mul_reciprocal.pod +++ b/doc/man3/BN_mod_mul_reciprocal.pod @@ -15,10 +15,10 @@ reciprocal int BN_RECP_CTX_set(BN_RECP_CTX *recp, const BIGNUM *m, BN_CTX *ctx); - int BN_div_recp(BIGNUM *dv, BIGNUM *rem, BIGNUM *a, BN_RECP_CTX *recp, + int BN_div_recp(BIGNUM *dv, BIGNUM *rem, const BIGNUM *a, BN_RECP_CTX *recp, BN_CTX *ctx); - int BN_mod_mul_reciprocal(BIGNUM *r, BIGNUM *a, BIGNUM *b, + int BN_mod_mul_reciprocal(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_RECP_CTX *recp, BN_CTX *ctx); =head1 DESCRIPTION diff --git a/doc/man3/CRYPTO_get_ex_new_index.pod b/doc/man3/CRYPTO_get_ex_new_index.pod index 86b3745d8d..d2b44fd694 100644 --- a/doc/man3/CRYPTO_get_ex_new_index.pod +++ b/doc/man3/CRYPTO_get_ex_new_index.pod @@ -32,7 +32,7 @@ CRYPTO_free_ex_data, CRYPTO_new_ex_data int CRYPTO_set_ex_data(CRYPTO_EX_DATA *r, int idx, void *arg); - void *CRYPTO_get_ex_data(CRYPTO_EX_DATA *r, int idx); + void *CRYPTO_get_ex_data(const CRYPTO_EX_DATA *r, int idx); void CRYPTO_free_ex_data(int class_index, void *obj, CRYPTO_EX_DATA *r); diff --git a/doc/man3/OPENSSL_instrument_bus.pod b/doc/man3/OPENSSL_instrument_bus.pod index fe72bb882d..c5e3d3fca4 100644 --- a/doc/man3/OPENSSL_instrument_bus.pod +++ b/doc/man3/OPENSSL_instrument_bus.pod @@ -7,8 +7,8 @@ OPENSSL_instrument_bus, OPENSSL_instrument_bus2 - instrument references to memor =head1 SYNOPSIS #ifdef OPENSSL_CPUID_OBJ - size_t OPENSSL_instrument_bus(int *vector, size_t num); - size_t OPENSSL_instrument_bus2(int *vector, size_t num, size_t max); + size_t OPENSSL_instrument_bus(unsigned int *vector, size_t num); + size_t OPENSSL_instrument_bus2(unsigned int *vector, size_t num, size_t max); #endif =head1 DESCRIPTION diff --git a/doc/man3/OSSL_DECODER_CTX.pod b/doc/man3/OSSL_DECODER_CTX.pod index 0c9db4e087..a15902da08 100644 --- a/doc/man3/OSSL_DECODER_CTX.pod +++ b/doc/man3/OSSL_DECODER_CTX.pod @@ -47,7 +47,9 @@ OSSL_DECODER_INSTANCE_get_input_structure int OSSL_DECODER_CTX_set_input_structure(OSSL_DECODER_CTX *ctx, const char *input_structure); int OSSL_DECODER_CTX_add_decoder(OSSL_DECODER_CTX *ctx, OSSL_DECODER *decoder); - int OSSL_DECODER_CTX_add_extra(OSSL_DECODER_CTX *ctx); + int OSSL_DECODER_CTX_add_extra(OSSL_DECODER_CTX *ctx, + OSSL_LIB_CTX *libctx, + const char *propq); int OSSL_DECODER_CTX_get_num_decoders(OSSL_DECODER_CTX *ctx); typedef struct ossl_decoder_instance_st OSSL_DECODER_INSTANCE; diff --git a/doc/man3/RSA_print.pod b/doc/man3/RSA_print.pod index ee1995aa7e..f85c5f3f47 100644 --- a/doc/man3/RSA_print.pod +++ b/doc/man3/RSA_print.pod @@ -14,8 +14,8 @@ Deprecated since OpenSSL 3.0, can be hidden entirely by defining B<OPENSSL_API_COMPAT> with a suitable version value, see L<openssl_user_macros(7)>: - int RSA_print(BIO *bp, RSA *x, int offset); - int RSA_print_fp(FILE *fp, RSA *x, int offset); + int RSA_print(BIO *bp, const RSA *x, int offset); + int RSA_print_fp(FILE *fp, const RSA *x, int offset); #include <openssl/dsa.h> @@ -23,10 +23,10 @@ Deprecated since OpenSSL 3.0, can be hidden entirely by defining B<OPENSSL_API_COMPAT> with a suitable version value, see L<openssl_user_macros(7)>: - int DSAparams_print(BIO *bp, DSA *x); - int DSAparams_print_fp(FILE *fp, DSA *x); - int DSA_print(BIO *bp, DSA *x, int offset); - int DSA_print_fp(FILE *fp, DSA *x, int offset); + int DSAparams_print(BIO *bp, const DSA *x); + int DSAparams_print_fp(FILE *fp, const DSA *x); + int DSA_print(BIO *bp, const DSA *x, int offset); + int DSA_print_fp(FILE *fp, const DSA *x, int offset); #include <openssl/dh.h> @@ -35,7 +35,7 @@ B<OPENSSL_API_COMPAT> with a suitable version value, see L<openssl_user_macros(7)>: int DHparams_print(BIO *bp, DH *x); - int DHparams_print_fp(FILE *fp, DH *x); + int DHparams_print_fp(FILE *fp, const DH *x); =head1 DESCRIPTION diff --git a/doc/man3/SSL_CIPHER_get_name.pod b/doc/man3/SSL_CIPHER_get_name.pod index c70e0d2799..5f8d3abf45 100644 --- a/doc/man3/SSL_CIPHER_get_name.pod +++ b/doc/man3/SSL_CIPHER_get_name.pod @@ -27,7 +27,7 @@ SSL_CIPHER_get_protocol_id const char *SSL_CIPHER_standard_name(const SSL_CIPHER *cipher); const char *OPENSSL_cipher_name(const char *stdname); int SSL_CIPHER_get_bits(const SSL_CIPHER *cipher, int *alg_bits); - char *SSL_CIPHER_get_version(const SSL_CIPHER *cipher); + const char *SSL_CIPHER_get_version(const SSL_CIPHER *cipher); char *SSL_CIPHER_description(const SSL_CIPHER *cipher, char *buf, int size); int SSL_CIPHER_get_cipher_nid(const SSL_CIPHER *c); int SSL_CIPHER_get_digest_nid(const SSL_CIPHER *c); diff --git a/doc/man3/X509_get_pubkey.pod b/doc/man3/X509_get_pubkey.pod index e9626672e1..c292cd3d2b 100644 --- a/doc/man3/X509_get_pubkey.pod +++ b/doc/man3/X509_get_pubkey.pod @@ -14,7 +14,7 @@ public key EVP_PKEY *X509_get_pubkey(X509 *x); EVP_PKEY *X509_get0_pubkey(const X509 *x); int X509_set_pubkey(X509 *x, EVP_PKEY *pkey); - X509_PUBKEY *X509_get_X509_PUBKEY(X509 *x); + X509_PUBKEY *X509_get_X509_PUBKEY(const X509 *x); EVP_PKEY *X509_REQ_get_pubkey(X509_REQ *req); EVP_PKEY *X509_REQ_get0_pubkey(X509_REQ *req); diff --git a/doc/man3/i2d_re_X509_tbs.pod b/doc/man3/i2d_re_X509_tbs.pod index 4a9cbe5b38..76d46eab7a 100644 --- a/doc/man3/i2d_re_X509_tbs.pod +++ b/doc/man3/i2d_re_X509_tbs.pod @@ -11,7 +11,7 @@ i2d_re_X509_tbs, i2d_re_X509_CRL_tbs, i2d_re_X509_REQ_tbs #include <openssl/x509.h> X509 *d2i_X509_AUX(X509 **px, const unsigned char **in, long len); - int i2d_X509_AUX(X509 *x, unsigned char **out); + int i2d_X509_AUX(const X509 *x, unsigned char **out); int i2d_re_X509_tbs(X509 *x, unsigned char **out); int i2d_re_X509_CRL_tbs(X509_CRL *crl, unsigned char **pp); int i2d_re_X509_REQ_tbs(X509_REQ *req, unsigned char **pp);