Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 663100 Details for
Bug 562050
dev-qt/qtnetwork add libressl support
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
qtnetwork-5.15.9999(5.15.2)-libressl.patch
qtnetwork-5.15.2-libressl.patch (text/plain), 17.57 KB, created by
jospezial
on 2020-09-29 08:25:03 UTC
(
hide
)
Description:
qtnetwork-5.15.9999(5.15.2)-libressl.patch
Filename:
MIME Type:
Creator:
jospezial
Created:
2020-09-29 08:25:03 UTC
Size:
17.57 KB
patch
obsolete
>diff --git a/src/network/ssl/qsslcertificate_openssl.cpp b/src/network/ssl/qsslcertificate_openssl.cpp >index ca9d61ccb1..19774432ce 100644 >--- a/src/network/ssl/qsslcertificate_openssl.cpp >+++ b/src/network/ssl/qsslcertificate_openssl.cpp >@@ -661,7 +661,7 @@ static QMultiMap<QByteArray, QString> _q_mapFromX509Name(X509_NAME *name) > unsigned char *data = nullptr; > int size = q_ASN1_STRING_to_UTF8(&data, q_X509_NAME_ENTRY_get_data(e)); > info.insert(name, QString::fromUtf8((char*)data, size)); >-#if QT_CONFIG(opensslv11) >+#if QT_CONFIG(opensslv11) && !defined(LIBRESSL_VERSION_NUMBER) > q_CRYPTO_free(data, nullptr, 0); > #else > q_CRYPTO_free(data); >diff --git a/src/network/ssl/qsslcontext_openssl.cpp b/src/network/ssl/qsslcontext_openssl.cpp >index c9f202f573..6d6f5f7fd7 100644 >--- a/src/network/ssl/qsslcontext_openssl.cpp >+++ b/src/network/ssl/qsslcontext_openssl.cpp >@@ -54,12 +54,14 @@ > > QT_BEGIN_NAMESPACE > >+#ifdef SSL_SECOP_PEER > Q_GLOBAL_STATIC(bool, forceSecurityLevel) > > Q_NETWORK_EXPORT void qt_ForceTlsSecurityLevel() > { > *forceSecurityLevel() = true; > } >+#endif //SSL_SECOP_PEER > > // defined in qsslsocket_openssl.cpp: > extern int q_X509Callback(int ok, X509_STORE_CTX *ctx); >@@ -351,9 +353,11 @@ init_context: > return; > } > >+#ifdef SSL_SECOP_PEER > // A nasty hacked OpenSSL using a level that will make our auto-tests fail: > if (q_SSL_CTX_get_security_level(sslContext->ctx) > 1 && *forceSecurityLevel()) > q_SSL_CTX_set_security_level(sslContext->ctx, 1); >+#endif //SSL_SECOP_PEER > > const long anyVersion = > #if QT_CONFIG(dtls) >@@ -408,16 +412,28 @@ init_context: > maxVersion = DTLS1_VERSION; > break; > case QSsl::DtlsV1_0OrLater: >+#ifdef DTLS_MAX_VERSION > minVersion = DTLS1_VERSION; > maxVersion = DTLS_MAX_VERSION; >+#else >+ Q_UNREACHABLE(); >+#endif // DTLS_MAX_VERSION > break; > case QSsl::DtlsV1_2: >+#ifdef DTLS1_2_VERSION > minVersion = DTLS1_2_VERSION; > maxVersion = DTLS1_2_VERSION; >+#else >+ Q_UNREACHABLE(); >+#endif // DTLS1_2_VERSION > break; > case QSsl::DtlsV1_2OrLater: >+#if defined(DTLS1_2_VERSION) && defined(DTLS_MAX_VERSION) > minVersion = DTLS1_2_VERSION; > maxVersion = DTLS_MAX_VERSION; >+#else >+ Q_UNREACHABLE(); >+#endif // DTLS1_2_VERSION && DTLS_MAX_VERSION > break; > case QSsl::TlsV1_3OrLater: > #ifdef TLS1_3_VERSION >@@ -722,6 +738,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext) > } > #endif // ocsp > >+#ifndef LIBRESSL_VERSION_NUMBER > QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free); > if (cctx) { > q_SSL_CONF_CTX_set_ssl_ctx(cctx.data(), sslContext->ctx); >@@ -768,7 +785,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext) > sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_finish() failed")); > sslContext->errorCode = QSslError::UnspecifiedError; > } >- } else { >+ } else >+#endif // LIBRESSL_VERSION_NUMBER >+ { > sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_CTX_new() failed")); > sslContext->errorCode = QSslError::UnspecifiedError; > } >diff --git a/src/network/ssl/qsslcontext_openssl_p.h b/src/network/ssl/qsslcontext_openssl_p.h >index 70cb97aad8..01a61cf535 100644 >--- a/src/network/ssl/qsslcontext_openssl_p.h >+++ b/src/network/ssl/qsslcontext_openssl_p.h >@@ -61,6 +61,13 @@ > > QT_BEGIN_NAMESPACE > >+#ifndef DTLS_ANY_VERSION >+#define DTLS_ANY_VERSION 0x1FFFF >+#endif >+#ifndef TLS_ANY_VERSION >+#define TLS_ANY_VERSION 0x10000 >+#endif >+ > #ifndef QT_NO_SSL > > class QSslContextPrivate; >diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp >index 277037e59c..f599498df5 100644 >--- a/src/network/ssl/qsslsocket_openssl.cpp >+++ b/src/network/ssl/qsslsocket_openssl.cpp >@@ -653,7 +653,7 @@ bool QSslSocketBackendPrivate::initSslContext() > else if (mode == QSslSocket::SslServerMode) > q_SSL_set_psk_server_callback(ssl, &q_ssl_psk_server_callback); > >-#if OPENSSL_VERSION_NUMBER >= 0x10101006L >+#if OPENSSL_VERSION_NUMBER >= 0x10101006L && !defined(LIBRESSL_VERSION_NUMBER) > // Set the client callback for TLSv1.3 PSK > if (mode == QSslSocket::SslClientMode > && QSslSocket::sslLibraryBuildVersionNumber() >= 0x10101006L) { >diff --git a/src/network/ssl/qsslsocket_openssl_symbols.cpp b/src/network/ssl/qsslsocket_openssl_symbols.cpp >index ed80fc14bd..b3a40924ab 100644 >--- a/src/network/ssl/qsslsocket_openssl_symbols.cpp >+++ b/src/network/ssl/qsslsocket_openssl_symbols.cpp >@@ -145,11 +145,14 @@ DEFINEFUNC(const BIO_METHOD *, BIO_s_mem, void, DUMMYARG, return nullptr, return > DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w, w, return 0, return) > DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *c, c, return 0, return) > DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, return 0, return) >+#ifdef OPENSSL_NO_DEPRECATED_3_0 > DEFINEFUNC2(EVP_PKEY_CTX *, EVP_PKEY_CTX_new, EVP_PKEY *pkey, pkey, ENGINE *e, e, return nullptr, return) > DEFINEFUNC(int, EVP_PKEY_param_check, EVP_PKEY_CTX *ctx, ctx, return 0, return) > DEFINEFUNC(void, EVP_PKEY_CTX_free, EVP_PKEY_CTX *ctx, ctx, return, return) >+#endif // OPENSSL_NO_DEPRECATED_3_0 > DEFINEFUNC(int, EVP_PKEY_base_id, EVP_PKEY *a, a, return NID_undef, return) > DEFINEFUNC(int, RSA_bits, RSA *a, a, return 0, return) >+#ifndef LIBRESSL_VERSION_NUMBER > DEFINEFUNC(int, DSA_bits, DSA *a, a, return 0, return) > DEFINEFUNC(int, OPENSSL_sk_num, OPENSSL_STACK *a, a, return -1, return) > DEFINEFUNC2(void, OPENSSL_sk_pop_free, OPENSSL_STACK *a, a, void (*b)(void*), b, return, DUMMYARG) >@@ -157,10 +160,20 @@ DEFINEFUNC(OPENSSL_STACK *, OPENSSL_sk_new_null, DUMMYARG, DUMMYARG, return null > DEFINEFUNC2(void, OPENSSL_sk_push, OPENSSL_STACK *a, a, void *b, b, return, DUMMYARG) > DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, return, DUMMYARG) > DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return nullptr, return) >+#else >+DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return) >+DEFINEFUNC2(void, sk_pop_free, STACK *a, a, void (*b)(void*), b, return, DUMMYARG) >+DEFINEFUNC(_STACK *, sk_new_null, DUMMYARG, DUMMYARG, return nullptr, return) >+DEFINEFUNC2(void, sk_push, _STACK *a, a, void *b, b, return, DUMMYARG) >+DEFINEFUNC(void, sk_free, _STACK *a, a, return, DUMMYARG) >+DEFINEFUNC2(void *, sk_value, STACK *a, a, int b, b, return nullptr, return) >+#endif // LIBRESSL_VERSION_NUMBER > DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return) > DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return) >+#ifdef SSL_SECOP_PEER > DEFINEFUNC(int, SSL_CTX_get_security_level, const SSL_CTX *ctx, ctx, return -1, return) > DEFINEFUNC2(void, SSL_CTX_set_security_level, SSL_CTX *ctx, ctx, int level, level, return, return) >+#endif //SSL_SECOP_PEER > #ifdef TLS1_3_VERSION > DEFINEFUNC2(int, SSL_CTX_set_ciphersuites, SSL_CTX *ctx, ctx, const char *str, str, return 0, return) > DEFINEFUNC2(void, SSL_set_psk_use_session_callback, SSL *ssl, ssl, q_SSL_psk_use_session_cb_func_t callback, callback, return, DUMMYARG) >@@ -184,7 +197,11 @@ DEFINEFUNC2(void, X509_STORE_set_verify_cb, X509_STORE *a, a, X509_STORE_CTX_ver > DEFINEFUNC3(int, X509_STORE_set_ex_data, X509_STORE *a, a, int idx, idx, void *data, data, return 0, return) > DEFINEFUNC2(void *, X509_STORE_get_ex_data, X509_STORE *r, r, int idx, idx, return nullptr, return) > DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get0_chain, X509_STORE_CTX *a, a, return nullptr, return) >+#ifndef LIBRESSL_VERSION_NUMBER > DEFINEFUNC3(void, CRYPTO_free, void *str, str, const char *file, file, int line, line, return, DUMMYARG) >+#else >+DEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG) >+#endif > DEFINEFUNC(long, OpenSSL_version_num, void, DUMMYARG, return 0, return) > DEFINEFUNC(const char *, OpenSSL_version, int a, a, return nullptr, return) > DEFINEFUNC(unsigned long, SSL_SESSION_get_ticket_lifetime_hint, const SSL_SESSION *session, session, return 0, return) >@@ -224,7 +241,9 @@ DEFINEFUNC5(int, OCSP_id_get0_info, ASN1_OCTET_STRING **piNameHash, piNameHash, > ASN1_OCTET_STRING **piKeyHash, piKeyHash, ASN1_INTEGER **pserial, pserial, OCSP_CERTID *cid, cid, > return 0, return) > DEFINEFUNC2(OCSP_RESPONSE *, OCSP_response_create, int status, status, OCSP_BASICRESP *bs, bs, return nullptr, return) >+#ifndef LIBRESSL_VERSION_NUMBER > DEFINEFUNC(const STACK_OF(X509) *, OCSP_resp_get0_certs, const OCSP_BASICRESP *bs, bs, return nullptr, return) >+#endif > DEFINEFUNC2(int, OCSP_id_cmp, OCSP_CERTID *a, a, OCSP_CERTID *b, b, return -1, return) > DEFINEFUNC7(OCSP_SINGLERESP *, OCSP_basic_add1_status, OCSP_BASICRESP *r, r, OCSP_CERTID *c, c, int s, s, > int re, re, ASN1_TIME *rt, rt, ASN1_TIME *t, t, ASN1_TIME *n, n, return nullptr, return) >@@ -356,12 +375,14 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a, EVP_PKEY *b, b, return - > DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return) > DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return) > DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return) >+#ifndef LIBRESSL_VERSION_NUMBER > DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return nullptr, return); > DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return); > DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX *a, a, SSL_CTX *b, b, return, return); > DEFINEFUNC2(unsigned int, SSL_CONF_CTX_set_flags, SSL_CONF_CTX *a, a, unsigned int b, b, return 0, return); > DEFINEFUNC(int, SSL_CONF_CTX_finish, SSL_CONF_CTX *a, a, return 0, return); > DEFINEFUNC3(int, SSL_CONF_cmd, SSL_CONF_CTX *a, a, const char *b, b, const char *c, c, return 0, return); >+#endif > DEFINEFUNC(void, SSL_free, SSL *a, a, return, DUMMYARG) > DEFINEFUNC(STACK_OF(SSL_CIPHER) *, SSL_get_ciphers, const SSL *a, a, return nullptr, return) > DEFINEFUNC(const SSL_CIPHER *, SSL_get_current_cipher, SSL *a, a, return nullptr, return) >@@ -845,21 +866,27 @@ bool q_resolveOpenSslSymbols() > RESOLVEFUNC(ASN1_STRING_get0_data) > RESOLVEFUNC(EVP_CIPHER_CTX_reset) > RESOLVEFUNC(EVP_PKEY_up_ref) >+#ifdef OPENSSL_NO_DEPRECATED_3_0 > RESOLVEFUNC(EVP_PKEY_CTX_new) > RESOLVEFUNC(EVP_PKEY_param_check) > RESOLVEFUNC(EVP_PKEY_CTX_free) >+#endif // OPENSSL_NO_DEPRECATED_3_0 > RESOLVEFUNC(EVP_PKEY_base_id) > RESOLVEFUNC(RSA_bits) >+#ifndef LIBRESSL_VERSION_NUMBER > RESOLVEFUNC(OPENSSL_sk_new_null) > RESOLVEFUNC(OPENSSL_sk_push) > RESOLVEFUNC(OPENSSL_sk_free) > RESOLVEFUNC(OPENSSL_sk_num) > RESOLVEFUNC(OPENSSL_sk_pop_free) > RESOLVEFUNC(OPENSSL_sk_value) >+#endif > RESOLVEFUNC(DH_get0_pqg) > RESOLVEFUNC(SSL_CTX_set_options) >+#ifdef SSL_SECOP_PEER > RESOLVEFUNC(SSL_CTX_get_security_level) > RESOLVEFUNC(SSL_CTX_set_security_level) >+#endif //SSL_SECOP_PEER > #ifdef TLS1_3_VERSION > RESOLVEFUNC(SSL_CTX_set_ciphersuites) > RESOLVEFUNC(SSL_set_psk_use_session_callback) >@@ -898,7 +925,9 @@ bool q_resolveOpenSslSymbols() > > RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint) > RESOLVEFUNC(DH_bits) >+#ifndef LIBRESSL_VERSION_NUMBER > RESOLVEFUNC(DSA_bits) >+#endif > > #if QT_CONFIG(dtls) > RESOLVEFUNC(DTLSv1_listen) >@@ -928,7 +957,9 @@ bool q_resolveOpenSslSymbols() > RESOLVEFUNC(OCSP_check_validity) > RESOLVEFUNC(OCSP_cert_to_id) > RESOLVEFUNC(OCSP_id_get0_info) >+#ifndef LIBRESSL_VERSION_NUMBER > RESOLVEFUNC(OCSP_resp_get0_certs) >+#endif > RESOLVEFUNC(OCSP_basic_sign) > RESOLVEFUNC(OCSP_response_create) > RESOLVEFUNC(i2d_OCSP_RESPONSE) >@@ -1058,12 +1089,14 @@ bool q_resolveOpenSslSymbols() > RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey) > RESOLVEFUNC(SSL_CTX_use_PrivateKey_file) > RESOLVEFUNC(SSL_CTX_get_cert_store); >+#ifndef LIBRESSL_VERSION_NUMBER > RESOLVEFUNC(SSL_CONF_CTX_new); > RESOLVEFUNC(SSL_CONF_CTX_free); > RESOLVEFUNC(SSL_CONF_CTX_set_ssl_ctx); > RESOLVEFUNC(SSL_CONF_CTX_set_flags); > RESOLVEFUNC(SSL_CONF_CTX_finish); > RESOLVEFUNC(SSL_CONF_cmd); >+#endif > RESOLVEFUNC(SSL_accept) > RESOLVEFUNC(SSL_clear) > RESOLVEFUNC(SSL_connect) >diff --git a/src/network/ssl/qsslsocket_openssl_symbols_p.h b/src/network/ssl/qsslsocket_openssl_symbols_p.h >index c46afcf53e..f6d562e976 100644 >--- a/src/network/ssl/qsslsocket_openssl_symbols_p.h >+++ b/src/network/ssl/qsslsocket_openssl_symbols_p.h >@@ -80,6 +80,13 @@ QT_BEGIN_NAMESPACE > > #define DUMMYARG > >+#ifdef LIBRESSL_VERSION_NUMBER >+typedef _STACK STACK; >+typedef STACK OPENSSL_STACK; >+typedef void OPENSSL_INIT_SETTINGS; >+typedef int (*X509_STORE_CTX_verify_cb)(int ok,X509_STORE_CTX *ctx); >+#endif >+ > #if !defined QT_LINKED_OPENSSL > // **************** Shared declarations ****************** > // ret func(arg) >@@ -230,20 +237,43 @@ const unsigned char * q_ASN1_STRING_get0_data(const ASN1_STRING *x); > Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a); > Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem(); > >+#ifndef LIBRESSL_VERSION_NUMBER > 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_EVP_PKEY_base_id(EVP_PKEY *a); > int q_RSA_bits(RSA *a); >+ >+#ifndef LIBRESSL_VERSION_NUMBER > 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(); > Q_AUTOTEST_EXPORT void q_OPENSSL_sk_push(OPENSSL_STACK *st, void *data); > Q_AUTOTEST_EXPORT void q_OPENSSL_sk_free(OPENSSL_STACK *a); > Q_AUTOTEST_EXPORT void * q_OPENSSL_sk_value(OPENSSL_STACK *a, int b); >+#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) >+#endif // LIBRESSL_VERSION_NUMBER >+ > int q_SSL_session_reused(SSL *a); > unsigned long q_SSL_CTX_set_options(SSL_CTX *ctx, unsigned long op); > int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings); >@@ -269,8 +299,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) > >+#ifndef LIBRESSL_VERSION_NUMBER > #define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_OPENSSL_sk_num)(st) > #define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_OPENSSL_sk_value)(st, i) >+#else >+#define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st) >+#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(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 \ >@@ -279,7 +314,11 @@ 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); >@@ -497,12 +536,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_PrivateKey_file(SSL_CTX *a, const char *b, int c); > X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a); >+#ifndef LIBRESSL_VERSION_NUMBER > SSL_CONF_CTX *q_SSL_CONF_CTX_new(); > 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); > 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_cmd(SSL_CONF_CTX *a, const char *b, const char *c); >+#endif > void q_SSL_free(SSL *a); > STACK_OF(SSL_CIPHER) *q_SSL_get_ciphers(const SSL *a); > const SSL_CIPHER *q_SSL_get_current_cipher(SSL *a); >@@ -728,7 +769,11 @@ int q_OCSP_check_validity(ASN1_GENERALIZEDTIME *thisupd, ASN1_GENERALIZEDTIME *n > int q_OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash, ASN1_OBJECT **pmd, ASN1_OCTET_STRING **pikeyHash, > ASN1_INTEGER **pserial, OCSP_CERTID *cid); > >+#ifndef LIBRESSL_VERSION_NUMBER > 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); >@@ -748,8 +793,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 > > QT_END_NAMESPACE >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 562050
:
413512
|
413514
|
414236
|
428320
|
430294
|
430296
|
437876
|
462288
|
502750
|
502766
|
502770
|
502778
|
529810
|
554572
|
554574
|
555740
|
558324
|
580336
| 663100