Differential D35729 Diff 108379 net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols__p.h
Changeset View
Changeset View
Standalone View
Standalone View
net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols__p.h
--- src/network/ssl/qsslsocket_openssl_symbols_p.h.orig 2022-06-28 10:06:55 UTC | --- src/network/ssl/qsslsocket_openssl_symbols_p.h.orig 2022-06-22 10:58:13 UTC | ||||
+++ src/network/ssl/qsslsocket_openssl_symbols_p.h | +++ src/network/ssl/qsslsocket_openssl_symbols_p.h | ||||
@@ -80,6 +80,13 @@ QT_BEGIN_NAMESPACE | @@ -80,6 +80,13 @@ QT_BEGIN_NAMESPACE | ||||
#define DUMMYARG | #define DUMMYARG | ||||
+#ifdef LIBRESSL_VERSION_NUMBER | +#ifdef LIBRESSL_VERSION_NUMBER | ||||
+typedef _STACK STACK; | +typedef _STACK STACK; | ||||
+typedef STACK OPENSSL_STACK; | +typedef STACK OPENSSL_STACK; | ||||
+typedef void OPENSSL_INIT_SETTINGS; | +typedef void OPENSSL_INIT_SETTINGS; | ||||
+typedef int (*X509_STORE_CTX_verify_cb)(int ok,X509_STORE_CTX *ctx); | +typedef int (*X509_STORE_CTX_verify_cb)(int ok,X509_STORE_CTX *ctx); | ||||
+#endif | +#endif | ||||
+ | + | ||||
#if !defined QT_LINKED_OPENSSL | #if !defined QT_LINKED_OPENSSL | ||||
// **************** Shared declarations ****************** | // **************** Shared declarations ****************** | ||||
// ret func(arg) | // ret func(arg) | ||||
@@ -496,12 +503,14 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b); | @@ -230,13 +237,20 @@ const unsigned char * q_ASN1_STRING_get0_data(const AS | ||||
Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a); | |||||
Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem(); | |||||
+#if !defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER >= 0x03050000fL | |||||
int q_DSA_bits(DSA *a); | |||||
+#else | |||||
+#define q_DSA_bits(dsa) q_BN_num_bits((dsa)->p) | |||||
+#endif | |||||
int q_EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c); | |||||
Q_AUTOTEST_EXPORT int q_EVP_PKEY_up_ref(EVP_PKEY *a); | |||||
+#ifdef OPENSSL_NO_DEPRECATED_3_0 | |||||
EVP_PKEY_CTX *q_EVP_PKEY_CTX_new(EVP_PKEY *pkey, ENGINE *e); | |||||
void q_EVP_PKEY_CTX_free(EVP_PKEY_CTX *ctx); | |||||
int q_EVP_PKEY_param_check(EVP_PKEY_CTX *ctx); | |||||
+#endif // OPENSSL_NO_DEPRECATED_3_0 | |||||
int q_RSA_bits(RSA *a); | |||||
+#if !defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER >= 0x03050000fL | |||||
Q_AUTOTEST_EXPORT int q_OPENSSL_sk_num(OPENSSL_STACK *a); | |||||
Q_AUTOTEST_EXPORT void q_OPENSSL_sk_pop_free(OPENSSL_STACK *a, void (*b)(void *)); | |||||
Q_AUTOTEST_EXPORT OPENSSL_STACK *q_OPENSSL_sk_new_null(); | |||||
@@ -245,6 +259,24 @@ Q_AUTOTEST_EXPORT void q_OPENSSL_sk_free(OPENSSL_STACK | |||||
Q_AUTOTEST_EXPORT void * q_OPENSSL_sk_value(OPENSSL_STACK *a, int b); | |||||
int q_SSL_session_reused(SSL *a); | |||||
unsigned long q_SSL_CTX_set_options(SSL_CTX *ctx, unsigned long op); | |||||
+#else // LIBRESSL_VERSION_NUMBER | |||||
+int q_sk_num(STACK *a); | |||||
+#define q_OPENSSL_sk_num(a) q_sk_num(a) | |||||
+void q_sk_pop_free(STACK *a, void (*b)(void *)); | |||||
+#define q_OPENSSL_sk_pop_free(a, b) q_sk_pop_free(a, b) | |||||
+STACK *q_sk_new_null(); | |||||
+#define q_OPENSSL_sk_new_null() q_sk_new_null() | |||||
+void q_sk_push(STACK *st, void *data); | |||||
+#define q_OPENSSL_sk_push(st, data) q_sk_push(st, data) | |||||
+void q_sk_free(STACK *a); | |||||
+#define q_OPENSSL_sk_free q_sk_free | |||||
+void *q_sk_value(STACK *a, int b); | |||||
+#define q_OPENSSL_sk_value(a, b) q_sk_value(a, b) | |||||
+#define q_SSL_session_reused(ssl) \ | |||||
+ q_SSL_ctrl((ssl), SSL_CTRL_GET_SESSION_REUSED, 0, NULL) | |||||
+#define q_SSL_CTX_set_options(ctx, op) \ | |||||
+ q_SSL_CTX_ctrl((ctx), SSL_CTRL_OPTIONS, (op), NULL) | |||||
+#endif // LIBRESSL_VERSION_NUMBER | |||||
int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings); | |||||
size_t q_SSL_get_client_random(SSL *a, unsigned char *out, size_t outlen); | |||||
size_t q_SSL_SESSION_get_master_key(const SSL_SESSION *session, unsigned char *out, size_t outlen); | |||||
@@ -268,8 +300,13 @@ int q_DH_bits(DH *dh); | |||||
# define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \ | |||||
| OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL) | |||||
+#if !defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER >= 0x03050000fL | |||||
#define q_SKM_sk_num(st) q_OPENSSL_sk_num((OPENSSL_STACK *)st) | |||||
#define q_SKM_sk_value(type, st,i) (type *)q_OPENSSL_sk_value((OPENSSL_STACK *)st, i) | |||||
+#else | |||||
+#define q_SKM_sk_num(st) q_sk_num((OPENSSL_STACK *)st) | |||||
+#define q_SKM_sk_value(type, st,i) (type *)q_sk_value((OPENSSL_STACK *)st, i) | |||||
+#endif // LIBRESSL_VERSION_NUMBER | |||||
#define q_OPENSSL_add_all_algorithms_conf() q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \ | |||||
| OPENSSL_INIT_ADD_ALL_DIGESTS \ | |||||
@@ -278,13 +315,22 @@ int q_DH_bits(DH *dh); | |||||
| OPENSSL_INIT_ADD_ALL_DIGESTS, NULL) | |||||
int q_OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings); | |||||
+#ifndef LIBRESSL_VERSION_NUMBER | |||||
void q_CRYPTO_free(void *str, const char *file, int line); | |||||
+#else | |||||
+void q_CRYPTO_free(void *a); | |||||
+#endif | |||||
long q_OpenSSL_version_num(); | |||||
const char *q_OpenSSL_version(int type); | |||||
unsigned long q_SSL_SESSION_get_ticket_lifetime_hint(const SSL_SESSION *session); | |||||
+#ifndef LIBRESSL_VERSION_NUMBER | |||||
unsigned long q_SSL_set_options(SSL *s, unsigned long op); | |||||
+#else | |||||
+#define q_SSL_set_options(ssl, op) \ | |||||
+ q_SSL_ctrl((ssl), SSL_CTRL_OPTIONS, (op), NULL) | |||||
+#endif | |||||
#ifdef TLS1_3_VERSION | |||||
int q_SSL_CTX_set_ciphersuites(SSL_CTX *ctx, const char *str); | |||||
@@ -373,7 +419,12 @@ BIO *q_BIO_new_mem_buf(void *a, int b); | |||||
int q_BIO_read(BIO *a, void *b, int c); | |||||
Q_AUTOTEST_EXPORT int q_BIO_write(BIO *a, const void *b, int c); | |||||
int q_BN_num_bits(const BIGNUM *a); | |||||
+#if !defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER >= 0x03050000fL | |||||
int q_BN_is_word(BIGNUM *a, BN_ULONG w); | |||||
+#else | |||||
+#define q_BN_is_word(a, w) (((((a)->top == 1) && ((a)->d[0] == (BN_ULONG)(w))) \ | |||||
+ || (((w) == 0) && ((a)->top == 0))) && (!(w) || !(a)->neg)) | |||||
+#endif | |||||
BN_ULONG q_BN_mod_word(const BIGNUM *a, BN_ULONG w); | |||||
#ifndef OPENSSL_NO_EC | |||||
@@ -496,12 +547,14 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b); | |||||
int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX *a, RSA *b); | int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX *a, RSA *b); | ||||
int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c); | int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c); | ||||
X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a); | X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a); | ||||
+#ifndef LIBRESSL_VERSION_NUMBER | +#ifndef LIBRESSL_VERSION_NUMBER | ||||
SSL_CONF_CTX *q_SSL_CONF_CTX_new(); | SSL_CONF_CTX *q_SSL_CONF_CTX_new(); | ||||
void q_SSL_CONF_CTX_free(SSL_CONF_CTX *a); | void q_SSL_CONF_CTX_free(SSL_CONF_CTX *a); | ||||
void q_SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *a, SSL_CTX *b); | void q_SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *a, SSL_CTX *b); | ||||
unsigned int q_SSL_CONF_CTX_set_flags(SSL_CONF_CTX *a, unsigned int b); | unsigned int q_SSL_CONF_CTX_set_flags(SSL_CONF_CTX *a, unsigned int b); | ||||
int q_SSL_CONF_CTX_finish(SSL_CONF_CTX *a); | int q_SSL_CONF_CTX_finish(SSL_CONF_CTX *a); | ||||
int q_SSL_CONF_cmd(SSL_CONF_CTX *a, const char *b, const char *c); | int q_SSL_CONF_cmd(SSL_CONF_CTX *a, const char *b, const char *c); | ||||
+#endif | +#endif | ||||
void q_SSL_free(SSL *a); | void q_SSL_free(SSL *a); | ||||
STACK_OF(SSL_CIPHER) *q_SSL_get_ciphers(const SSL *a); | STACK_OF(SSL_CIPHER) *q_SSL_get_ciphers(const SSL *a); | ||||
const SSL_CIPHER *q_SSL_get_current_cipher(SSL *a); | const SSL_CIPHER *q_SSL_get_current_cipher(SSL *a); | ||||
@@ -517,7 +570,12 @@ void q_SSL_set_bio(SSL *a, BIO *b, BIO *c); | |||||
void q_SSL_set_accept_state(SSL *a); | |||||
void q_SSL_set_connect_state(SSL *a); | |||||
int q_SSL_shutdown(SSL *a); | |||||
+#ifndef LIBRESSL_VERSION_NUMBER | |||||
int q_SSL_in_init(const SSL *s); | |||||
+#else | |||||
+int q_SSL_state(const SSL *s); | |||||
+#define q_SSL_in_init(s) (q_SSL_state((s))&SSL_ST_INIT) | |||||
+#endif | |||||
int q_SSL_get_shutdown(const SSL *ssl); | |||||
int q_SSL_set_session(SSL *to, SSL_SESSION *session); | |||||
void q_SSL_SESSION_free(SSL_SESSION *ses); | |||||
@@ -723,7 +781,11 @@ int q_OCSP_check_validity(ASN1_GENERALIZEDTIME *thisup | |||||
int q_OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash, ASN1_OBJECT **pmd, ASN1_OCTET_STRING **pikeyHash, | |||||
ASN1_INTEGER **pserial, OCSP_CERTID *cid); | |||||
+#if !defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER >= 0x03050000fL | |||||
const STACK_OF(X509) *q_OCSP_resp_get0_certs(const OCSP_BASICRESP *bs); | |||||
+#else | |||||
+#define q_OCSP_resp_get0_certs(bs) ((bs)->certs) | |||||
+#endif | |||||
Q_AUTOTEST_EXPORT OCSP_CERTID *q_OCSP_cert_to_id(const EVP_MD *dgst, X509 *subject, X509 *issuer); | |||||
Q_AUTOTEST_EXPORT void q_OCSP_CERTID_free(OCSP_CERTID *cid); | |||||
int q_OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b); | |||||
@@ -743,8 +805,10 @@ int q_OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b); | |||||
void *q_CRYPTO_malloc(size_t num, const char *file, int line); | |||||
#define q_OPENSSL_malloc(num) q_CRYPTO_malloc(num, "", 0) | |||||
+#ifdef SSL_SECOP_PEER | |||||
int q_SSL_CTX_get_security_level(const SSL_CTX *ctx); | |||||
void q_SSL_CTX_set_security_level(SSL_CTX *ctx, int level); | |||||
+#endif //SSL_SECOP_PEER | |||||
// Here we have the ones that make difference between OpenSSL pre/post v3: | |||||
#if defined(OPENSSL_VERSION_MAJOR) && OPENSSL_VERSION_MAJOR >= 3 |