[openssl] openssl-3.0 update
matthias.st.pierre at ncp-e.com
matthias.st.pierre at ncp-e.com
Wed Oct 20 19:33:52 UTC 2021
The branch openssl-3.0 has been updated
via 52d762961f1f873bbcaa7fba113587edd149b7df (commit)
from 7199bbf88fe3f42e0ec8a7c2d7ca80b23f1de932 (commit)
- Log -----------------------------------------------------------------
commit 52d762961f1f873bbcaa7fba113587edd149b7df
Author: PW Hu <jlu.hpw at foxmail.com>
Date: Mon Oct 18 16:49:14 2021 +0800
Fix function signature error
Reviewed-by: Tomas Mraz <tomas at openssl.org>
Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre at ncp-e.com>
(Merged from https://github.com/openssl/openssl/pull/16852)
(cherry picked from commit 10343fa52731c6a66a761b578d2aa37a364083c8)
-----------------------------------------------------------------------
Summary of changes:
doc/man3/BN_BLINDING_new.pod | 4 ++--
doc/man3/RSA_check_key.pod | 4 ++--
doc/man3/RSA_set_method.pod | 6 +++---
doc/man3/SSL_CTX_set_options.pod | 4 ++--
doc/man3/SSL_CTX_use_certificate.pod | 12 ++++++------
5 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/doc/man3/BN_BLINDING_new.pod b/doc/man3/BN_BLINDING_new.pod
index 25d3c642a0..f8c6329192 100644
--- a/doc/man3/BN_BLINDING_new.pod
+++ b/doc/man3/BN_BLINDING_new.pod
@@ -26,8 +26,8 @@ BN_BLINDING_set_flags, BN_BLINDING_create_param - blinding related BIGNUM functi
void BN_BLINDING_set_current_thread(BN_BLINDING *b);
int BN_BLINDING_lock(BN_BLINDING *b);
int BN_BLINDING_unlock(BN_BLINDING *b);
- unsigned long BN_BLINDING_get_flags(const BN_BLINDING *);
- void BN_BLINDING_set_flags(BN_BLINDING *, unsigned long);
+ unsigned long BN_BLINDING_get_flags(const BN_BLINDING *b);
+ void BN_BLINDING_set_flags(BN_BLINDING *b, unsigned long flags);
BN_BLINDING *BN_BLINDING_create_param(BN_BLINDING *b,
const BIGNUM *e, BIGNUM *m, BN_CTX *ctx,
int (*bn_mod_exp)(BIGNUM *r,
diff --git a/doc/man3/RSA_check_key.pod b/doc/man3/RSA_check_key.pod
index f33d6b0aba..09db90ce06 100644
--- a/doc/man3/RSA_check_key.pod
+++ b/doc/man3/RSA_check_key.pod
@@ -12,9 +12,9 @@ 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_check_key_ex(RSA *rsa, BN_GENCB *cb);
+ int RSA_check_key_ex(const RSA *rsa, BN_GENCB *cb);
- int RSA_check_key(RSA *rsa);
+ int RSA_check_key(const RSA *rsa);
=head1 DESCRIPTION
diff --git a/doc/man3/RSA_set_method.pod b/doc/man3/RSA_set_method.pod
index 884765ce97..723cc06232 100644
--- a/doc/man3/RSA_set_method.pod
+++ b/doc/man3/RSA_set_method.pod
@@ -16,13 +16,13 @@ L<openssl_user_macros(7)>:
void RSA_set_default_method(const RSA_METHOD *meth);
- RSA_METHOD *RSA_get_default_method(void);
+ const RSA_METHOD *RSA_get_default_method(void);
int RSA_set_method(RSA *rsa, const RSA_METHOD *meth);
- RSA_METHOD *RSA_get_method(const RSA *rsa);
+ const RSA_METHOD *RSA_get_method(const RSA *rsa);
- RSA_METHOD *RSA_PKCS1_OpenSSL(void);
+ const RSA_METHOD *RSA_PKCS1_OpenSSL(void);
int RSA_flags(const RSA *rsa);
diff --git a/doc/man3/SSL_CTX_set_options.pod b/doc/man3/SSL_CTX_set_options.pod
index dfd0c83afc..08522522cd 100644
--- a/doc/man3/SSL_CTX_set_options.pod
+++ b/doc/man3/SSL_CTX_set_options.pod
@@ -16,8 +16,8 @@ SSL_get_secure_renegotiation_support - manipulate SSL options
uint64_t SSL_CTX_clear_options(SSL_CTX *ctx, uint64_t options);
uint64_t SSL_clear_options(SSL *ssl, uint64_t options);
- uint64_t SSL_CTX_get_options(SSL_CTX *ctx);
- uint64_t SSL_get_options(SSL *ssl);
+ uint64_t SSL_CTX_get_options(const SSL_CTX *ctx);
+ uint64_t SSL_get_options(const SSL *ssl);
long SSL_get_secure_renegotiation_support(SSL *ssl);
diff --git a/doc/man3/SSL_CTX_use_certificate.pod b/doc/man3/SSL_CTX_use_certificate.pod
index 72608c84da..ec9ea4205d 100644
--- a/doc/man3/SSL_CTX_use_certificate.pod
+++ b/doc/man3/SSL_CTX_use_certificate.pod
@@ -20,27 +20,27 @@ SSL_CTX_use_cert_and_key, SSL_use_cert_and_key
#include <openssl/ssl.h>
int SSL_CTX_use_certificate(SSL_CTX *ctx, X509 *x);
- int SSL_CTX_use_certificate_ASN1(SSL_CTX *ctx, int len, unsigned char *d);
+ int SSL_CTX_use_certificate_ASN1(SSL_CTX *ctx, int len, const unsigned char *d);
int SSL_CTX_use_certificate_file(SSL_CTX *ctx, const char *file, int type);
int SSL_use_certificate(SSL *ssl, X509 *x);
- int SSL_use_certificate_ASN1(SSL *ssl, unsigned char *d, int len);
+ int SSL_use_certificate_ASN1(SSL *ssl, const unsigned char *d, int len);
int SSL_use_certificate_file(SSL *ssl, const char *file, int type);
int SSL_CTX_use_certificate_chain_file(SSL_CTX *ctx, const char *file);
int SSL_use_certificate_chain_file(SSL *ssl, const char *file);
int SSL_CTX_use_PrivateKey(SSL_CTX *ctx, EVP_PKEY *pkey);
- int SSL_CTX_use_PrivateKey_ASN1(int pk, SSL_CTX *ctx, unsigned char *d,
+ int SSL_CTX_use_PrivateKey_ASN1(int pk, SSL_CTX *ctx, const unsigned char *d,
long len);
int SSL_CTX_use_PrivateKey_file(SSL_CTX *ctx, const char *file, int type);
int SSL_CTX_use_RSAPrivateKey(SSL_CTX *ctx, RSA *rsa);
- int SSL_CTX_use_RSAPrivateKey_ASN1(SSL_CTX *ctx, unsigned char *d, long len);
+ int SSL_CTX_use_RSAPrivateKey_ASN1(SSL_CTX *ctx, const unsigned char *d, long len);
int SSL_CTX_use_RSAPrivateKey_file(SSL_CTX *ctx, const char *file, int type);
int SSL_use_PrivateKey(SSL *ssl, EVP_PKEY *pkey);
- int SSL_use_PrivateKey_ASN1(int pk, SSL *ssl, unsigned char *d, long len);
+ int SSL_use_PrivateKey_ASN1(int pk, SSL *ssl, const unsigned char *d, long len);
int SSL_use_PrivateKey_file(SSL *ssl, const char *file, int type);
int SSL_use_RSAPrivateKey(SSL *ssl, RSA *rsa);
- int SSL_use_RSAPrivateKey_ASN1(SSL *ssl, unsigned char *d, long len);
+ int SSL_use_RSAPrivateKey_ASN1(SSL *ssl, const unsigned char *d, long len);
int SSL_use_RSAPrivateKey_file(SSL *ssl, const char *file, int type);
int SSL_CTX_check_private_key(const SSL_CTX *ctx);
More information about the openssl-commits
mailing list