Lines 1-4
Link Here
|
1 |
--- src/network/ssl/qsslsocket_openssl_symbols.cpp.orig 2022-06-22 10:58:13 UTC |
1 |
--- src/network/ssl/qsslsocket_openssl_symbols.cpp.orig 2022-12-09 10:58:56 UTC |
2 |
+++ src/network/ssl/qsslsocket_openssl_symbols.cpp |
2 |
+++ src/network/ssl/qsslsocket_openssl_symbols.cpp |
3 |
@@ -142,14 +142,21 @@ DEFINEFUNC2(int, OPENSSL_init_ssl, uint64_t opts, opts |
3 |
@@ -142,14 +142,21 @@ DEFINEFUNC2(int, OPENSSL_init_ssl, uint64_t opts, opts |
4 |
DEFINEFUNC2(int, OPENSSL_init_crypto, uint64_t opts, opts, const OPENSSL_INIT_SETTINGS *settings, settings, return 0, return) |
4 |
DEFINEFUNC2(int, OPENSSL_init_crypto, uint64_t opts, opts, const OPENSSL_INIT_SETTINGS *settings, settings, return 0, return) |
Lines 25-31
Link Here
|
25 |
@@ -158,8 +165,18 @@ DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, |
25 |
@@ -158,8 +165,18 @@ DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, |
26 |
DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return nullptr, return) |
26 |
DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return nullptr, return) |
27 |
DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return) |
27 |
DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return) |
28 |
DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return) |
28 |
DEFINEFUNC2(qssloptions, SSL_CTX_set_options, SSL_CTX *ctx, ctx, qssloptions op, op, return 0, return) |
29 |
+#else |
29 |
+#else |
30 |
+DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return) |
30 |
+DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return) |
31 |
+DEFINEFUNC2(void, sk_pop_free, STACK *a, a, void (*b)(void*), b, return, DUMMYARG) |
31 |
+DEFINEFUNC2(void, sk_pop_free, STACK *a, a, void (*b)(void*), b, return, DUMMYARG) |
Lines 51-57
Link Here
|
51 |
|
51 |
|
52 |
DEFINEFUNC(const SSL_METHOD *, TLS_method, DUMMYARG, DUMMYARG, return nullptr, return) |
52 |
DEFINEFUNC(const SSL_METHOD *, TLS_method, DUMMYARG, DUMMYARG, return nullptr, return) |
53 |
DEFINEFUNC(const SSL_METHOD *, TLS_client_method, DUMMYARG, DUMMYARG, return nullptr, return) |
53 |
DEFINEFUNC(const SSL_METHOD *, TLS_client_method, DUMMYARG, DUMMYARG, return nullptr, return) |
54 |
@@ -183,7 +202,11 @@ DEFINEFUNC2(void, X509_STORE_set_verify_cb, X509_STORE |
54 |
@@ -185,7 +204,11 @@ DEFINEFUNC2(void, X509_STORE_set_verify_cb, X509_STORE |
55 |
DEFINEFUNC3(int, X509_STORE_set_ex_data, X509_STORE *a, a, int idx, idx, void *data, data, return 0, return) |
55 |
DEFINEFUNC3(int, X509_STORE_set_ex_data, X509_STORE *a, a, int idx, idx, void *data, data, return 0, return) |
56 |
DEFINEFUNC2(void *, X509_STORE_get_ex_data, X509_STORE *r, r, int idx, idx, return nullptr, return) |
56 |
DEFINEFUNC2(void *, X509_STORE_get_ex_data, X509_STORE *r, r, int idx, idx, return nullptr, return) |
57 |
DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get0_chain, X509_STORE_CTX *a, a, return nullptr, return) |
57 |
DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get0_chain, X509_STORE_CTX *a, a, return nullptr, return) |
Lines 63-69
Link Here
|
63 |
DEFINEFUNC(long, OpenSSL_version_num, void, DUMMYARG, return 0, return) |
63 |
DEFINEFUNC(long, OpenSSL_version_num, void, DUMMYARG, return 0, return) |
64 |
DEFINEFUNC(const char *, OpenSSL_version, int a, a, return nullptr, return) |
64 |
DEFINEFUNC(const char *, OpenSSL_version, int a, a, return nullptr, return) |
65 |
DEFINEFUNC(unsigned long, SSL_SESSION_get_ticket_lifetime_hint, const SSL_SESSION *session, session, return 0, return) |
65 |
DEFINEFUNC(unsigned long, SSL_SESSION_get_ticket_lifetime_hint, const SSL_SESSION *session, session, return 0, return) |
66 |
@@ -223,7 +246,9 @@ DEFINEFUNC5(int, OCSP_id_get0_info, ASN1_OCTET_STRING |
66 |
@@ -225,7 +248,9 @@ DEFINEFUNC5(int, OCSP_id_get0_info, ASN1_OCTET_STRING |
67 |
ASN1_OCTET_STRING **piKeyHash, piKeyHash, ASN1_INTEGER **pserial, pserial, OCSP_CERTID *cid, cid, |
67 |
ASN1_OCTET_STRING **piKeyHash, piKeyHash, ASN1_INTEGER **pserial, pserial, OCSP_CERTID *cid, cid, |
68 |
return 0, return) |
68 |
return 0, return) |
69 |
DEFINEFUNC2(OCSP_RESPONSE *, OCSP_response_create, int status, status, OCSP_BASICRESP *bs, bs, return nullptr, return) |
69 |
DEFINEFUNC2(OCSP_RESPONSE *, OCSP_response_create, int status, status, OCSP_BASICRESP *bs, bs, return nullptr, return) |
Lines 73-79
Link Here
|
73 |
DEFINEFUNC2(int, OCSP_id_cmp, OCSP_CERTID *a, a, OCSP_CERTID *b, b, return -1, return) |
73 |
DEFINEFUNC2(int, OCSP_id_cmp, OCSP_CERTID *a, a, OCSP_CERTID *b, b, return -1, return) |
74 |
DEFINEFUNC7(OCSP_SINGLERESP *, OCSP_basic_add1_status, OCSP_BASICRESP *r, r, OCSP_CERTID *c, c, int s, s, |
74 |
DEFINEFUNC7(OCSP_SINGLERESP *, OCSP_basic_add1_status, OCSP_BASICRESP *r, r, OCSP_CERTID *c, c, int s, s, |
75 |
int re, re, ASN1_TIME *rt, rt, ASN1_TIME *t, t, ASN1_TIME *n, n, return nullptr, return) |
75 |
int re, re, ASN1_TIME *rt, rt, ASN1_TIME *t, t, ASN1_TIME *n, n, return nullptr, return) |
76 |
@@ -355,12 +380,14 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a |
76 |
@@ -358,12 +383,14 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a |
77 |
DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return) |
77 |
DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return) |
78 |
DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return) |
78 |
DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return) |
79 |
DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return) |
79 |
DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return) |
Lines 88-94
Link Here
|
88 |
DEFINEFUNC(void, SSL_free, SSL *a, a, return, DUMMYARG) |
88 |
DEFINEFUNC(void, SSL_free, SSL *a, a, return, DUMMYARG) |
89 |
DEFINEFUNC(STACK_OF(SSL_CIPHER) *, SSL_get_ciphers, const SSL *a, a, return nullptr, return) |
89 |
DEFINEFUNC(STACK_OF(SSL_CIPHER) *, SSL_get_ciphers, const SSL *a, a, return nullptr, return) |
90 |
DEFINEFUNC(const SSL_CIPHER *, SSL_get_current_cipher, SSL *a, a, return nullptr, return) |
90 |
DEFINEFUNC(const SSL_CIPHER *, SSL_get_current_cipher, SSL *a, a, return nullptr, return) |
91 |
@@ -385,7 +412,11 @@ DEFINEFUNC3(void, SSL_set_bio, SSL *a, a, BIO *b, b, B |
91 |
@@ -388,7 +415,11 @@ DEFINEFUNC3(void, SSL_set_bio, SSL *a, a, BIO *b, b, B |
92 |
DEFINEFUNC(void, SSL_set_accept_state, SSL *a, a, return, DUMMYARG) |
92 |
DEFINEFUNC(void, SSL_set_accept_state, SSL *a, a, return, DUMMYARG) |
93 |
DEFINEFUNC(void, SSL_set_connect_state, SSL *a, a, return, DUMMYARG) |
93 |
DEFINEFUNC(void, SSL_set_connect_state, SSL *a, a, return, DUMMYARG) |
94 |
DEFINEFUNC(int, SSL_shutdown, SSL *a, a, return -1, return) |
94 |
DEFINEFUNC(int, SSL_shutdown, SSL *a, a, return -1, return) |
Lines 100-108
Link Here
|
100 |
DEFINEFUNC(int, SSL_get_shutdown, const SSL *ssl, ssl, return 0, return) |
100 |
DEFINEFUNC(int, SSL_get_shutdown, const SSL *ssl, ssl, return 0, return) |
101 |
DEFINEFUNC2(int, SSL_set_session, SSL* to, to, SSL_SESSION *session, session, return -1, return) |
101 |
DEFINEFUNC2(int, SSL_set_session, SSL* to, to, SSL_SESSION *session, session, return -1, return) |
102 |
DEFINEFUNC(void, SSL_SESSION_free, SSL_SESSION *ses, ses, return, DUMMYARG) |
102 |
DEFINEFUNC(void, SSL_SESSION_free, SSL_SESSION *ses, ses, return, DUMMYARG) |
103 |
@@ -854,20 +885,35 @@ bool q_resolveOpenSslSymbols() |
103 |
@@ -863,20 +894,35 @@ bool q_resolveOpenSslSymbols() |
104 |
RESOLVEFUNC(ASN1_STRING_get0_data) |
|
|
105 |
RESOLVEFUNC(EVP_CIPHER_CTX_reset) |
104 |
RESOLVEFUNC(EVP_CIPHER_CTX_reset) |
|
|
105 |
RESOLVEFUNC(AUTHORITY_INFO_ACCESS_free) |
106 |
RESOLVEFUNC(EVP_PKEY_up_ref) |
106 |
RESOLVEFUNC(EVP_PKEY_up_ref) |
107 |
+#ifdef OPENSSL_NO_DEPRECATED_3_0 |
107 |
+#ifdef OPENSSL_NO_DEPRECATED_3_0 |
108 |
RESOLVEFUNC(EVP_PKEY_CTX_new) |
108 |
RESOLVEFUNC(EVP_PKEY_CTX_new) |
Lines 136-142
Link Here
|
136 |
#ifdef TLS1_3_VERSION |
136 |
#ifdef TLS1_3_VERSION |
137 |
RESOLVEFUNC(SSL_CTX_set_ciphersuites) |
137 |
RESOLVEFUNC(SSL_CTX_set_ciphersuites) |
138 |
RESOLVEFUNC(SSL_set_psk_use_session_callback) |
138 |
RESOLVEFUNC(SSL_set_psk_use_session_callback) |
139 |
@@ -877,9 +923,13 @@ bool q_resolveOpenSslSymbols() |
139 |
@@ -886,9 +932,13 @@ bool q_resolveOpenSslSymbols() |
140 |
|
140 |
|
141 |
RESOLVEFUNC(SSL_get_client_random) |
141 |
RESOLVEFUNC(SSL_get_client_random) |
142 |
RESOLVEFUNC(SSL_SESSION_get_master_key) |
142 |
RESOLVEFUNC(SSL_SESSION_get_master_key) |
Lines 150-156
Link Here
|
150 |
RESOLVEFUNC(CRYPTO_get_ex_new_index) |
150 |
RESOLVEFUNC(CRYPTO_get_ex_new_index) |
151 |
RESOLVEFUNC(TLS_method) |
151 |
RESOLVEFUNC(TLS_method) |
152 |
RESOLVEFUNC(TLS_client_method) |
152 |
RESOLVEFUNC(TLS_client_method) |
153 |
@@ -906,7 +956,9 @@ bool q_resolveOpenSslSymbols() |
153 |
@@ -929,7 +979,9 @@ bool q_resolveOpenSslSymbols() |
154 |
|
154 |
|
155 |
RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint) |
155 |
RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint) |
156 |
RESOLVEFUNC(DH_bits) |
156 |
RESOLVEFUNC(DH_bits) |
Lines 160-166
Link Here
|
160 |
|
160 |
|
161 |
#if QT_CONFIG(dtls) |
161 |
#if QT_CONFIG(dtls) |
162 |
RESOLVEFUNC(DTLSv1_listen) |
162 |
RESOLVEFUNC(DTLSv1_listen) |
163 |
@@ -936,7 +988,9 @@ bool q_resolveOpenSslSymbols() |
163 |
@@ -959,7 +1011,9 @@ bool q_resolveOpenSslSymbols() |
164 |
RESOLVEFUNC(OCSP_check_validity) |
164 |
RESOLVEFUNC(OCSP_check_validity) |
165 |
RESOLVEFUNC(OCSP_cert_to_id) |
165 |
RESOLVEFUNC(OCSP_cert_to_id) |
166 |
RESOLVEFUNC(OCSP_id_get0_info) |
166 |
RESOLVEFUNC(OCSP_id_get0_info) |
Lines 170-176
Link Here
|
170 |
RESOLVEFUNC(OCSP_basic_sign) |
170 |
RESOLVEFUNC(OCSP_basic_sign) |
171 |
RESOLVEFUNC(OCSP_response_create) |
171 |
RESOLVEFUNC(OCSP_response_create) |
172 |
RESOLVEFUNC(i2d_OCSP_RESPONSE) |
172 |
RESOLVEFUNC(i2d_OCSP_RESPONSE) |
173 |
@@ -973,7 +1027,9 @@ bool q_resolveOpenSslSymbols() |
173 |
@@ -996,7 +1050,9 @@ bool q_resolveOpenSslSymbols() |
174 |
RESOLVEFUNC(EC_GROUP_get_degree) |
174 |
RESOLVEFUNC(EC_GROUP_get_degree) |
175 |
#endif |
175 |
#endif |
176 |
RESOLVEFUNC(BN_num_bits) |
176 |
RESOLVEFUNC(BN_num_bits) |
Lines 180-186
Link Here
|
180 |
RESOLVEFUNC(BN_mod_word) |
180 |
RESOLVEFUNC(BN_mod_word) |
181 |
RESOLVEFUNC(DSA_new) |
181 |
RESOLVEFUNC(DSA_new) |
182 |
RESOLVEFUNC(DSA_free) |
182 |
RESOLVEFUNC(DSA_free) |
183 |
@@ -1066,12 +1122,14 @@ bool q_resolveOpenSslSymbols() |
183 |
@@ -1089,12 +1145,14 @@ bool q_resolveOpenSslSymbols() |
184 |
RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey) |
184 |
RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey) |
185 |
RESOLVEFUNC(SSL_CTX_use_PrivateKey_file) |
185 |
RESOLVEFUNC(SSL_CTX_use_PrivateKey_file) |
186 |
RESOLVEFUNC(SSL_CTX_get_cert_store); |
186 |
RESOLVEFUNC(SSL_CTX_get_cert_store); |
Lines 195-201
Link Here
|
195 |
RESOLVEFUNC(SSL_accept) |
195 |
RESOLVEFUNC(SSL_accept) |
196 |
RESOLVEFUNC(SSL_clear) |
196 |
RESOLVEFUNC(SSL_clear) |
197 |
RESOLVEFUNC(SSL_connect) |
197 |
RESOLVEFUNC(SSL_connect) |
198 |
@@ -1099,7 +1157,11 @@ bool q_resolveOpenSslSymbols() |
198 |
@@ -1122,7 +1180,11 @@ bool q_resolveOpenSslSymbols() |
199 |
RESOLVEFUNC(SSL_set_bio) |
199 |
RESOLVEFUNC(SSL_set_bio) |
200 |
RESOLVEFUNC(SSL_set_connect_state) |
200 |
RESOLVEFUNC(SSL_set_connect_state) |
201 |
RESOLVEFUNC(SSL_shutdown) |
201 |
RESOLVEFUNC(SSL_shutdown) |