1 From 2aa448121ff62e104d333f192a7f19fc76d0cf19 Mon Sep 17 00:00:00 2001
2 From: Stefan Strogin <steils@gentoo.org>
3 Date: Wed, 5 Feb 2020 03:49:35 +0200
4 Subject: [PATCH] [PATCH] QSslSocket - add LibreSSL support
6 Upstream-Status: Inappropriate
7 [Upstream is not willing to accept any patches for LibreSSL support]
8 Signed-off-by: Stefan Strogin <steils@gentoo.org>
10 src/network/ssl/qsslcertificate_openssl.cpp | 2 +-
11 src/network/ssl/qsslcontext_openssl.cpp | 19 +++++++-
12 src/network/ssl/qsslcontext_openssl_p.h | 7 +++
13 src/network/ssl/qsslkey_openssl.cpp | 2 +-
14 src/network/ssl/qsslsocket_openssl.cpp | 2 +-
15 .../ssl/qsslsocket_openssl_symbols.cpp | 37 ++++++++++++++-
16 .../ssl/qsslsocket_openssl_symbols_p.h | 45 ++++++++++++++++++-
17 7 files changed, 107 insertions(+), 7 deletions(-)
19 diff --git qtbase/src/network/ssl/qsslcertificate_openssl.cpp qtbase/src/network/ssl/qsslcertificate_openssl.cpp
20 index ca9d61ccb1..19774432ce 100644
21 --- qtbase/src/network/ssl/qsslcertificate_openssl.cpp
22 +++ qtbase/src/network/ssl/qsslcertificate_openssl.cpp
23 @@ -661,7 +661,7 @@ static QMultiMap<QByteArray, QString> _q_mapFromX509Name(X509_NAME *name)
24 unsigned char *data = nullptr;
25 int size = q_ASN1_STRING_to_UTF8(&data, q_X509_NAME_ENTRY_get_data(e));
26 info.insert(name, QString::fromUtf8((char*)data, size));
27 -#if QT_CONFIG(opensslv11)
28 +#if QT_CONFIG(opensslv11) && !defined(LIBRESSL_VERSION_NUMBER)
29 q_CRYPTO_free(data, nullptr, 0);
32 diff --git qtbase/src/network/ssl/qsslcontext_openssl.cpp qtbase/src/network/ssl/qsslcontext_openssl.cpp
33 index c9f202f573..2ecdbbb7e5 100644
34 --- qtbase/src/network/ssl/qsslcontext_openssl.cpp
35 +++ qtbase/src/network/ssl/qsslcontext_openssl.cpp
36 @@ -351,9 +351,11 @@ init_context:
40 +#ifndef LIBRESSL_VERSION_NUMBER
41 // A nasty hacked OpenSSL using a level that will make our auto-tests fail:
42 if (q_SSL_CTX_get_security_level(sslContext->ctx) > 1 && *forceSecurityLevel())
43 q_SSL_CTX_set_security_level(sslContext->ctx, 1);
46 const long anyVersion =
48 @@ -408,16 +410,28 @@ init_context:
49 maxVersion = DTLS1_VERSION;
51 case QSsl::DtlsV1_0OrLater:
52 +#ifdef DTLS_MAX_VERSION
53 minVersion = DTLS1_VERSION;
54 maxVersion = DTLS_MAX_VERSION;
57 +#endif // DTLS_MAX_VERSION
60 +#ifdef DTLS1_2_VERSION
61 minVersion = DTLS1_2_VERSION;
62 maxVersion = DTLS1_2_VERSION;
65 +#endif // DTLS1_2_VERSION
67 case QSsl::DtlsV1_2OrLater:
68 +#if defined(DTLS1_2_VERSION) && defined(DTLS_MAX_VERSION)
69 minVersion = DTLS1_2_VERSION;
70 maxVersion = DTLS_MAX_VERSION;
73 +#endif // DTLS1_2_VERSION && DTLS_MAX_VERSION
75 case QSsl::TlsV1_3OrLater:
77 @@ -722,6 +736,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
81 +#ifndef LIBRESSL_VERSION_NUMBER
82 QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free);
84 q_SSL_CONF_CTX_set_ssl_ctx(cctx.data(), sslContext->ctx);
85 @@ -768,7 +783,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
86 sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_finish() failed"));
87 sslContext->errorCode = QSslError::UnspecifiedError;
91 +#endif // LIBRESSL_VERSION_NUMBER
93 sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_CTX_new() failed"));
94 sslContext->errorCode = QSslError::UnspecifiedError;
96 diff --git qtbase/src/network/ssl/qsslcontext_openssl_p.h qtbase/src/network/ssl/qsslcontext_openssl_p.h
97 index 70cb97aad8..01a61cf535 100644
98 --- qtbase/src/network/ssl/qsslcontext_openssl_p.h
99 +++ qtbase/src/network/ssl/qsslcontext_openssl_p.h
104 +#ifndef DTLS_ANY_VERSION
105 +#define DTLS_ANY_VERSION 0x1FFFF
107 +#ifndef TLS_ANY_VERSION
108 +#define TLS_ANY_VERSION 0x10000
113 class QSslContextPrivate;
114 diff --git qtbase/src/network/ssl/qsslkey_openssl.cpp qtbase/src/network/ssl/qsslkey_openssl.cpp
115 index 43cb8c6de8..a27336aa26 100644
116 --- qtbase/src/network/ssl/qsslkey_openssl.cpp
117 +++ qtbase/src/network/ssl/qsslkey_openssl.cpp
118 @@ -360,7 +360,7 @@ static QByteArray doCrypt(QSslKeyPrivate::Cipher cipher, const QByteArray &data,
119 q_EVP_CipherUpdate(ctx,
120 reinterpret_cast<unsigned char *>(output.data()), &len,
121 reinterpret_cast<const unsigned char *>(data.constData()), data.size());
122 - q_EVP_CipherFinal(ctx,
123 + q_EVP_CipherFinal_ex(ctx,
124 reinterpret_cast<unsigned char *>(output.data()) + len, &i);
127 diff --git qtbase/src/network/ssl/qsslsocket_openssl.cpp qtbase/src/network/ssl/qsslsocket_openssl.cpp
128 index 277037e59c..f599498df5 100644
129 --- qtbase/src/network/ssl/qsslsocket_openssl.cpp
130 +++ qtbase/src/network/ssl/qsslsocket_openssl.cpp
131 @@ -653,7 +653,7 @@ bool QSslSocketBackendPrivate::initSslContext()
132 else if (mode == QSslSocket::SslServerMode)
133 q_SSL_set_psk_server_callback(ssl, &q_ssl_psk_server_callback);
135 -#if OPENSSL_VERSION_NUMBER >= 0x10101006L
136 +#if OPENSSL_VERSION_NUMBER >= 0x10101006L && !defined(LIBRESSL_VERSION_NUMBER)
137 // Set the client callback for TLSv1.3 PSK
138 if (mode == QSslSocket::SslClientMode
139 && QSslSocket::sslLibraryBuildVersionNumber() >= 0x10101006L) {
140 diff --git qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
141 index ed80fc14bd..bad2ee2e41 100644
142 --- qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
143 +++ qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
144 @@ -146,10 +146,13 @@ DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w, w, return 0, return)
145 DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *c, c, return 0, return)
146 DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, return 0, return)
147 DEFINEFUNC2(EVP_PKEY_CTX *, EVP_PKEY_CTX_new, EVP_PKEY *pkey, pkey, ENGINE *e, e, return nullptr, return)
148 +#ifndef LIBRESSL_VERSION_NUMBER
149 DEFINEFUNC(int, EVP_PKEY_param_check, EVP_PKEY_CTX *ctx, ctx, return 0, return)
151 DEFINEFUNC(void, EVP_PKEY_CTX_free, EVP_PKEY_CTX *ctx, ctx, return, return)
152 DEFINEFUNC(int, EVP_PKEY_base_id, EVP_PKEY *a, a, return NID_undef, return)
153 DEFINEFUNC(int, RSA_bits, RSA *a, a, return 0, return)
154 +#ifndef LIBRESSL_VERSION_NUMBER
155 DEFINEFUNC(int, DSA_bits, DSA *a, a, return 0, return)
156 DEFINEFUNC(int, OPENSSL_sk_num, OPENSSL_STACK *a, a, return -1, return)
157 DEFINEFUNC2(void, OPENSSL_sk_pop_free, OPENSSL_STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
158 @@ -157,10 +160,20 @@ DEFINEFUNC(OPENSSL_STACK *, OPENSSL_sk_new_null, DUMMYARG, DUMMYARG, return null
159 DEFINEFUNC2(void, OPENSSL_sk_push, OPENSSL_STACK *a, a, void *b, b, return, DUMMYARG)
160 DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, return, DUMMYARG)
161 DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return nullptr, return)
163 +DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return)
164 +DEFINEFUNC2(void, sk_pop_free, STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
165 +DEFINEFUNC(_STACK *, sk_new_null, DUMMYARG, DUMMYARG, return nullptr, return)
166 +DEFINEFUNC2(void, sk_push, _STACK *a, a, void *b, b, return, DUMMYARG)
167 +DEFINEFUNC(void, sk_free, _STACK *a, a, return, DUMMYARG)
168 +DEFINEFUNC2(void *, sk_value, STACK *a, a, int b, b, return nullptr, return)
169 +#endif // LIBRESSL_VERSION_NUMBER
170 DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return)
171 DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return)
172 +#ifndef LIBRESSL_VERSION_NUMBER
173 DEFINEFUNC(int, SSL_CTX_get_security_level, const SSL_CTX *ctx, ctx, return -1, return)
174 DEFINEFUNC2(void, SSL_CTX_set_security_level, SSL_CTX *ctx, ctx, int level, level, return, return)
176 #ifdef TLS1_3_VERSION
177 DEFINEFUNC2(int, SSL_CTX_set_ciphersuites, SSL_CTX *ctx, ctx, const char *str, str, return 0, return)
178 DEFINEFUNC2(void, SSL_set_psk_use_session_callback, SSL *ssl, ssl, q_SSL_psk_use_session_cb_func_t callback, callback, return, DUMMYARG)
179 @@ -184,7 +197,11 @@ DEFINEFUNC2(void, X509_STORE_set_verify_cb, X509_STORE *a, a, X509_STORE_CTX_ver
180 DEFINEFUNC3(int, X509_STORE_set_ex_data, X509_STORE *a, a, int idx, idx, void *data, data, return 0, return)
181 DEFINEFUNC2(void *, X509_STORE_get_ex_data, X509_STORE *r, r, int idx, idx, return nullptr, return)
182 DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get0_chain, X509_STORE_CTX *a, a, return nullptr, return)
183 +#ifndef LIBRESSL_VERSION_NUMBER
184 DEFINEFUNC3(void, CRYPTO_free, void *str, str, const char *file, file, int line, line, return, DUMMYARG)
186 +DEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG)
188 DEFINEFUNC(long, OpenSSL_version_num, void, DUMMYARG, return 0, return)
189 DEFINEFUNC(const char *, OpenSSL_version, int a, a, return nullptr, return)
190 DEFINEFUNC(unsigned long, SSL_SESSION_get_ticket_lifetime_hint, const SSL_SESSION *session, session, return 0, return)
191 @@ -224,7 +241,9 @@ DEFINEFUNC5(int, OCSP_id_get0_info, ASN1_OCTET_STRING **piNameHash, piNameHash,
192 ASN1_OCTET_STRING **piKeyHash, piKeyHash, ASN1_INTEGER **pserial, pserial, OCSP_CERTID *cid, cid,
194 DEFINEFUNC2(OCSP_RESPONSE *, OCSP_response_create, int status, status, OCSP_BASICRESP *bs, bs, return nullptr, return)
195 +#ifndef LIBRESSL_VERSION_NUMBER
196 DEFINEFUNC(const STACK_OF(X509) *, OCSP_resp_get0_certs, const OCSP_BASICRESP *bs, bs, return nullptr, return)
198 DEFINEFUNC2(int, OCSP_id_cmp, OCSP_CERTID *a, a, OCSP_CERTID *b, b, return -1, return)
199 DEFINEFUNC7(OCSP_SINGLERESP *, OCSP_basic_add1_status, OCSP_BASICRESP *r, r, OCSP_CERTID *c, c, int s, s,
200 int re, re, ASN1_TIME *rt, rt, ASN1_TIME *t, t, ASN1_TIME *n, n, return nullptr, return)
201 @@ -269,7 +288,7 @@ DEFINEFUNC2(int, EVP_CIPHER_CTX_set_key_length, EVP_CIPHER_CTX *ctx, ctx, int ke
202 DEFINEFUNC5(int, EVP_CipherInit, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *type, type, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
203 DEFINEFUNC6(int, EVP_CipherInit_ex, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *cipher, cipher, ENGINE *impl, impl, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
204 DEFINEFUNC5(int, EVP_CipherUpdate, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, const unsigned char *in, in, int inl, inl, return 0, return)
205 -DEFINEFUNC3(int, EVP_CipherFinal, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
206 +DEFINEFUNC3(int, EVP_CipherFinal_ex, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
207 DEFINEFUNC(const EVP_MD *, EVP_get_digestbyname, const char *name, name, return nullptr, return)
208 #ifndef OPENSSL_NO_DES
209 DEFINEFUNC(const EVP_CIPHER *, EVP_des_cbc, DUMMYARG, DUMMYARG, return nullptr, return)
210 @@ -356,12 +375,14 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a, EVP_PKEY *b, b, return -
211 DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return)
212 DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return)
213 DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return)
214 +#ifndef LIBRESSL_VERSION_NUMBER
215 DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return nullptr, return);
216 DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return);
217 DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX *a, a, SSL_CTX *b, b, return, return);
218 DEFINEFUNC2(unsigned int, SSL_CONF_CTX_set_flags, SSL_CONF_CTX *a, a, unsigned int b, b, return 0, return);
219 DEFINEFUNC(int, SSL_CONF_CTX_finish, SSL_CONF_CTX *a, a, return 0, return);
220 DEFINEFUNC3(int, SSL_CONF_cmd, SSL_CONF_CTX *a, a, const char *b, b, const char *c, c, return 0, return);
222 DEFINEFUNC(void, SSL_free, SSL *a, a, return, DUMMYARG)
223 DEFINEFUNC(STACK_OF(SSL_CIPHER) *, SSL_get_ciphers, const SSL *a, a, return nullptr, return)
224 DEFINEFUNC(const SSL_CIPHER *, SSL_get_current_cipher, SSL *a, a, return nullptr, return)
225 @@ -846,20 +867,26 @@ bool q_resolveOpenSslSymbols()
226 RESOLVEFUNC(EVP_CIPHER_CTX_reset)
227 RESOLVEFUNC(EVP_PKEY_up_ref)
228 RESOLVEFUNC(EVP_PKEY_CTX_new)
229 +#ifndef LIBRESSL_VERSION_NUMBER
230 RESOLVEFUNC(EVP_PKEY_param_check)
232 RESOLVEFUNC(EVP_PKEY_CTX_free)
233 RESOLVEFUNC(EVP_PKEY_base_id)
234 RESOLVEFUNC(RSA_bits)
235 +#ifndef LIBRESSL_VERSION_NUMBER
236 RESOLVEFUNC(OPENSSL_sk_new_null)
237 RESOLVEFUNC(OPENSSL_sk_push)
238 RESOLVEFUNC(OPENSSL_sk_free)
239 RESOLVEFUNC(OPENSSL_sk_num)
240 RESOLVEFUNC(OPENSSL_sk_pop_free)
241 RESOLVEFUNC(OPENSSL_sk_value)
243 RESOLVEFUNC(DH_get0_pqg)
244 RESOLVEFUNC(SSL_CTX_set_options)
245 +#ifndef LIBRESSL_VERSION_NUMBER
246 RESOLVEFUNC(SSL_CTX_get_security_level)
247 RESOLVEFUNC(SSL_CTX_set_security_level)
249 #ifdef TLS1_3_VERSION
250 RESOLVEFUNC(SSL_CTX_set_ciphersuites)
251 RESOLVEFUNC(SSL_set_psk_use_session_callback)
252 @@ -898,7 +925,9 @@ bool q_resolveOpenSslSymbols()
254 RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint)
256 +#ifndef LIBRESSL_VERSION_NUMBER
257 RESOLVEFUNC(DSA_bits)
261 RESOLVEFUNC(DTLSv1_listen)
262 @@ -928,7 +957,9 @@ bool q_resolveOpenSslSymbols()
263 RESOLVEFUNC(OCSP_check_validity)
264 RESOLVEFUNC(OCSP_cert_to_id)
265 RESOLVEFUNC(OCSP_id_get0_info)
266 +#ifndef LIBRESSL_VERSION_NUMBER
267 RESOLVEFUNC(OCSP_resp_get0_certs)
269 RESOLVEFUNC(OCSP_basic_sign)
270 RESOLVEFUNC(OCSP_response_create)
271 RESOLVEFUNC(i2d_OCSP_RESPONSE)
272 @@ -979,7 +1010,7 @@ bool q_resolveOpenSslSymbols()
273 RESOLVEFUNC(EVP_CipherInit)
274 RESOLVEFUNC(EVP_CipherInit_ex)
275 RESOLVEFUNC(EVP_CipherUpdate)
276 - RESOLVEFUNC(EVP_CipherFinal)
277 + RESOLVEFUNC(EVP_CipherFinal_ex)
278 RESOLVEFUNC(EVP_get_digestbyname)
279 #ifndef OPENSSL_NO_DES
280 RESOLVEFUNC(EVP_des_cbc)
281 @@ -1058,12 +1089,14 @@ bool q_resolveOpenSslSymbols()
282 RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey)
283 RESOLVEFUNC(SSL_CTX_use_PrivateKey_file)
284 RESOLVEFUNC(SSL_CTX_get_cert_store);
285 +#ifndef LIBRESSL_VERSION_NUMBER
286 RESOLVEFUNC(SSL_CONF_CTX_new);
287 RESOLVEFUNC(SSL_CONF_CTX_free);
288 RESOLVEFUNC(SSL_CONF_CTX_set_ssl_ctx);
289 RESOLVEFUNC(SSL_CONF_CTX_set_flags);
290 RESOLVEFUNC(SSL_CONF_CTX_finish);
291 RESOLVEFUNC(SSL_CONF_cmd);
293 RESOLVEFUNC(SSL_accept)
294 RESOLVEFUNC(SSL_clear)
295 RESOLVEFUNC(SSL_connect)
296 diff --git qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
297 index c46afcf53e..3945bada5f 100644
298 --- qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
299 +++ qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
300 @@ -80,6 +80,13 @@ QT_BEGIN_NAMESPACE
304 +#ifdef LIBRESSL_VERSION_NUMBER
305 +typedef _STACK STACK;
306 +typedef STACK OPENSSL_STACK;
307 +typedef void OPENSSL_INIT_SETTINGS;
308 +typedef int (*X509_STORE_CTX_verify_cb)(int ok,X509_STORE_CTX *ctx);
311 #if !defined QT_LINKED_OPENSSL
312 // **************** Shared declarations ******************
314 @@ -230,7 +237,11 @@ const unsigned char * q_ASN1_STRING_get0_data(const ASN1_STRING *x);
315 Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a);
316 Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem();
318 +#ifndef LIBRESSL_VERSION_NUMBER
319 int q_DSA_bits(DSA *a);
321 +#define q_DSA_bits(dsa) q_BN_num_bits((dsa)->p)
323 int q_EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c);
324 Q_AUTOTEST_EXPORT int q_EVP_PKEY_up_ref(EVP_PKEY *a);
325 EVP_PKEY_CTX *q_EVP_PKEY_CTX_new(EVP_PKEY *pkey, ENGINE *e);
326 @@ -238,12 +249,29 @@ void q_EVP_PKEY_CTX_free(EVP_PKEY_CTX *ctx);
327 int q_EVP_PKEY_param_check(EVP_PKEY_CTX *ctx);
328 int q_EVP_PKEY_base_id(EVP_PKEY *a);
329 int q_RSA_bits(RSA *a);
331 +#ifndef LIBRESSL_VERSION_NUMBER
332 Q_AUTOTEST_EXPORT int q_OPENSSL_sk_num(OPENSSL_STACK *a);
333 Q_AUTOTEST_EXPORT void q_OPENSSL_sk_pop_free(OPENSSL_STACK *a, void (*b)(void *));
334 Q_AUTOTEST_EXPORT OPENSSL_STACK *q_OPENSSL_sk_new_null();
335 Q_AUTOTEST_EXPORT void q_OPENSSL_sk_push(OPENSSL_STACK *st, void *data);
336 Q_AUTOTEST_EXPORT void q_OPENSSL_sk_free(OPENSSL_STACK *a);
337 Q_AUTOTEST_EXPORT void * q_OPENSSL_sk_value(OPENSSL_STACK *a, int b);
338 +#else // LIBRESSL_VERSION_NUMBER
339 +int q_sk_num(STACK *a);
340 +#define q_OPENSSL_sk_num(a) q_sk_num(a)
341 +void q_sk_pop_free(STACK *a, void (*b)(void *));
342 +#define q_OPENSSL_sk_pop_free(a, b) q_sk_pop_free(a, b)
343 +STACK *q_sk_new_null();
344 +#define q_OPENSSL_sk_new_null() q_sk_new_null()
345 +void q_sk_push(STACK *st, void *data);
346 +#define q_OPENSSL_sk_push(st, data) q_sk_push(st, data)
347 +void q_sk_free(STACK *a);
348 +#define q_OPENSSL_sk_free q_sk_free
349 +void *q_sk_value(STACK *a, int b);
350 +#define q_OPENSSL_sk_value(a, b) q_sk_value(a, b)
351 +#endif // LIBRESSL_VERSION_NUMBER
353 int q_SSL_session_reused(SSL *a);
354 unsigned long q_SSL_CTX_set_options(SSL_CTX *ctx, unsigned long op);
355 int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
356 @@ -269,8 +297,13 @@ int q_DH_bits(DH *dh);
357 # define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \
358 | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL)
360 +#ifndef LIBRESSL_VERSION_NUMBER
361 #define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_OPENSSL_sk_num)(st)
362 #define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_OPENSSL_sk_value)(st, i)
364 +#define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st)
365 +#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(st, i)
366 +#endif // LIBRESSL_VERSION_NUMBER
368 #define q_OPENSSL_add_all_algorithms_conf() q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
369 | OPENSSL_INIT_ADD_ALL_DIGESTS \
370 @@ -279,7 +312,11 @@ int q_DH_bits(DH *dh);
371 | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL)
373 int q_OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
374 +#ifndef LIBRESSL_VERSION_NUMBER
375 void q_CRYPTO_free(void *str, const char *file, int line);
377 +void q_CRYPTO_free(void *a);
380 long q_OpenSSL_version_num();
381 const char *q_OpenSSL_version(int type);
382 @@ -395,7 +432,7 @@ int q_EVP_CIPHER_CTX_set_key_length(EVP_CIPHER_CTX *x, int keylen);
383 int q_EVP_CipherInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, const unsigned char *key, const unsigned char *iv, int enc);
384 int q_EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *impl, const unsigned char *key, const unsigned char *iv, int enc);
385 int q_EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl, const unsigned char *in, int inl);
386 -int q_EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
387 +int q_EVP_CipherFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
388 const EVP_MD *q_EVP_get_digestbyname(const char *name);
390 #ifndef OPENSSL_NO_DES
391 @@ -497,12 +534,14 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b);
392 int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX *a, RSA *b);
393 int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c);
394 X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a);
395 +#ifndef LIBRESSL_VERSION_NUMBER
396 SSL_CONF_CTX *q_SSL_CONF_CTX_new();
397 void q_SSL_CONF_CTX_free(SSL_CONF_CTX *a);
398 void q_SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *a, SSL_CTX *b);
399 unsigned int q_SSL_CONF_CTX_set_flags(SSL_CONF_CTX *a, unsigned int b);
400 int q_SSL_CONF_CTX_finish(SSL_CONF_CTX *a);
401 int q_SSL_CONF_cmd(SSL_CONF_CTX *a, const char *b, const char *c);
403 void q_SSL_free(SSL *a);
404 STACK_OF(SSL_CIPHER) *q_SSL_get_ciphers(const SSL *a);
405 const SSL_CIPHER *q_SSL_get_current_cipher(SSL *a);
406 @@ -728,7 +767,11 @@ int q_OCSP_check_validity(ASN1_GENERALIZEDTIME *thisupd, ASN1_GENERALIZEDTIME *n
407 int q_OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash, ASN1_OBJECT **pmd, ASN1_OCTET_STRING **pikeyHash,
408 ASN1_INTEGER **pserial, OCSP_CERTID *cid);
410 +#ifndef LIBRESSL_VERSION_NUMBER
411 const STACK_OF(X509) *q_OCSP_resp_get0_certs(const OCSP_BASICRESP *bs);
413 +#define q_OCSP_resp_get0_certs(bs) ((bs)->certs)
415 Q_AUTOTEST_EXPORT OCSP_CERTID *q_OCSP_cert_to_id(const EVP_MD *dgst, X509 *subject, X509 *issuer);
416 Q_AUTOTEST_EXPORT void q_OCSP_CERTID_free(OCSP_CERTID *cid);
417 int q_OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b);