Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 562050 | Differences between
and this patch

Collapse All | Expand All

(-)a/src/network/ssl/qsslcertificate_openssl.cpp (-1 / +1 lines)
Lines 661-667 static QMultiMap<QByteArray, QString> _q_mapFromX509Name(X509_NAME *name) Link Here
661
        unsigned char *data = nullptr;
661
        unsigned char *data = nullptr;
662
        int size = q_ASN1_STRING_to_UTF8(&data, q_X509_NAME_ENTRY_get_data(e));
662
        int size = q_ASN1_STRING_to_UTF8(&data, q_X509_NAME_ENTRY_get_data(e));
663
        info.insert(name, QString::fromUtf8((char*)data, size));
663
        info.insert(name, QString::fromUtf8((char*)data, size));
664
#if QT_CONFIG(opensslv11)
664
#if QT_CONFIG(opensslv11) && !defined(LIBRESSL_VERSION_NUMBER)
665
        q_CRYPTO_free(data, nullptr, 0);
665
        q_CRYPTO_free(data, nullptr, 0);
666
#else
666
#else
667
        q_CRYPTO_free(data);
667
        q_CRYPTO_free(data);
(-)a/src/network/ssl/qsslcontext_openssl.cpp (-1 / +20 lines)
Lines 54-65 Link Here
54
54
55
QT_BEGIN_NAMESPACE
55
QT_BEGIN_NAMESPACE
56
56
57
#ifdef SSL_SECOP_PEER
57
Q_GLOBAL_STATIC(bool, forceSecurityLevel)
58
Q_GLOBAL_STATIC(bool, forceSecurityLevel)
58
59
59
Q_NETWORK_EXPORT void qt_ForceTlsSecurityLevel()
60
Q_NETWORK_EXPORT void qt_ForceTlsSecurityLevel()
60
{
61
{
61
    *forceSecurityLevel() = true;
62
    *forceSecurityLevel() = true;
62
}
63
}
64
#endif //SSL_SECOP_PEER
63
65
64
// defined in qsslsocket_openssl.cpp:
66
// defined in qsslsocket_openssl.cpp:
65
extern int q_X509Callback(int ok, X509_STORE_CTX *ctx);
67
extern int q_X509Callback(int ok, X509_STORE_CTX *ctx);
Lines 351-359 init_context: Link Here
351
        return;
353
        return;
352
    }
354
    }
353
355
356
#ifdef SSL_SECOP_PEER
354
    // A nasty hacked OpenSSL using a level that will make our auto-tests fail:
357
    // A nasty hacked OpenSSL using a level that will make our auto-tests fail:
355
    if (q_SSL_CTX_get_security_level(sslContext->ctx) > 1 && *forceSecurityLevel())
358
    if (q_SSL_CTX_get_security_level(sslContext->ctx) > 1 && *forceSecurityLevel())
356
        q_SSL_CTX_set_security_level(sslContext->ctx, 1);
359
        q_SSL_CTX_set_security_level(sslContext->ctx, 1);
360
#endif //SSL_SECOP_PEER
357
361
358
    const long anyVersion =
362
    const long anyVersion =
359
#if QT_CONFIG(dtls)
363
#if QT_CONFIG(dtls)
Lines 408-423 init_context: Link Here
408
        maxVersion = DTLS1_VERSION;
412
        maxVersion = DTLS1_VERSION;
409
        break;
413
        break;
410
    case QSsl::DtlsV1_0OrLater:
414
    case QSsl::DtlsV1_0OrLater:
415
#ifdef DTLS_MAX_VERSION
411
        minVersion = DTLS1_VERSION;
416
        minVersion = DTLS1_VERSION;
412
        maxVersion = DTLS_MAX_VERSION;
417
        maxVersion = DTLS_MAX_VERSION;
418
#else
419
        Q_UNREACHABLE();
420
#endif // DTLS_MAX_VERSION
413
        break;
421
        break;
414
    case QSsl::DtlsV1_2:
422
    case QSsl::DtlsV1_2:
423
#ifdef DTLS1_2_VERSION
415
        minVersion = DTLS1_2_VERSION;
424
        minVersion = DTLS1_2_VERSION;
416
        maxVersion = DTLS1_2_VERSION;
425
        maxVersion = DTLS1_2_VERSION;
426
#else
427
        Q_UNREACHABLE();
428
#endif // DTLS1_2_VERSION
417
        break;
429
        break;
418
    case QSsl::DtlsV1_2OrLater:
430
    case QSsl::DtlsV1_2OrLater:
431
#if defined(DTLS1_2_VERSION) && defined(DTLS_MAX_VERSION)
419
        minVersion = DTLS1_2_VERSION;
432
        minVersion = DTLS1_2_VERSION;
420
        maxVersion = DTLS_MAX_VERSION;
433
        maxVersion = DTLS_MAX_VERSION;
434
#else
435
        Q_UNREACHABLE();
436
#endif // DTLS1_2_VERSION && DTLS_MAX_VERSION
421
        break;
437
        break;
422
    case QSsl::TlsV1_3OrLater:
438
    case QSsl::TlsV1_3OrLater:
423
#ifdef TLS1_3_VERSION
439
#ifdef TLS1_3_VERSION
Lines 722-727 void QSslContext::applyBackendConfig(QSslContext *sslContext) Link Here
722
    }
738
    }
723
#endif // ocsp
739
#endif // ocsp
724
740
741
#ifndef LIBRESSL_VERSION_NUMBER
725
    QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free);
742
    QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free);
726
    if (cctx) {
743
    if (cctx) {
727
        q_SSL_CONF_CTX_set_ssl_ctx(cctx.data(), sslContext->ctx);
744
        q_SSL_CONF_CTX_set_ssl_ctx(cctx.data(), sslContext->ctx);
Lines 768-774 void QSslContext::applyBackendConfig(QSslContext *sslContext) Link Here
768
            sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_finish() failed"));
785
            sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_finish() failed"));
769
            sslContext->errorCode = QSslError::UnspecifiedError;
786
            sslContext->errorCode = QSslError::UnspecifiedError;
770
        }
787
        }
771
    } else {
788
    } else
789
#endif // LIBRESSL_VERSION_NUMBER
790
    {
772
        sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_CTX_new() failed"));
791
        sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_CTX_new() failed"));
773
        sslContext->errorCode = QSslError::UnspecifiedError;
792
        sslContext->errorCode = QSslError::UnspecifiedError;
774
    }
793
    }
(-)a/src/network/ssl/qsslcontext_openssl_p.h (+7 lines)
Lines 61-66 Link Here
61
61
62
QT_BEGIN_NAMESPACE
62
QT_BEGIN_NAMESPACE
63
63
64
#ifndef DTLS_ANY_VERSION
65
#define DTLS_ANY_VERSION 0x1FFFF
66
#endif
67
#ifndef TLS_ANY_VERSION
68
#define TLS_ANY_VERSION 0x10000
69
#endif
70
64
#ifndef QT_NO_SSL
71
#ifndef QT_NO_SSL
65
72
66
class QSslContextPrivate;
73
class QSslContextPrivate;
(-)a/src/network/ssl/qsslsocket_openssl.cpp (-1 / +1 lines)
Lines 653-659 bool QSslSocketBackendPrivate::initSslContext() Link Here
653
    else if (mode == QSslSocket::SslServerMode)
653
    else if (mode == QSslSocket::SslServerMode)
654
        q_SSL_set_psk_server_callback(ssl, &q_ssl_psk_server_callback);
654
        q_SSL_set_psk_server_callback(ssl, &q_ssl_psk_server_callback);
655
655
656
#if OPENSSL_VERSION_NUMBER >= 0x10101006L
656
#if OPENSSL_VERSION_NUMBER >= 0x10101006L && !defined(LIBRESSL_VERSION_NUMBER)
657
    // Set the client callback for TLSv1.3 PSK
657
    // Set the client callback for TLSv1.3 PSK
658
    if (mode == QSslSocket::SslClientMode
658
    if (mode == QSslSocket::SslClientMode
659
        && QSslSocket::sslLibraryBuildVersionNumber() >= 0x10101006L) {
659
        && QSslSocket::sslLibraryBuildVersionNumber() >= 0x10101006L) {
(-)a/src/network/ssl/qsslsocket_openssl_symbols.cpp (+33 lines)
Lines 145-155 DEFINEFUNC(const BIO_METHOD *, BIO_s_mem, void, DUMMYARG, return nullptr, return Link Here
145
DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w, w, return 0, return)
145
DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w, w, return 0, return)
146
DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *c, c, return 0, return)
146
DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *c, c, return 0, return)
147
DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, return 0, return)
147
DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, return 0, return)
148
#ifdef OPENSSL_NO_DEPRECATED_3_0
148
DEFINEFUNC2(EVP_PKEY_CTX *, EVP_PKEY_CTX_new, EVP_PKEY *pkey, pkey, ENGINE *e, e, return nullptr, return)
149
DEFINEFUNC2(EVP_PKEY_CTX *, EVP_PKEY_CTX_new, EVP_PKEY *pkey, pkey, ENGINE *e, e, return nullptr, return)
149
DEFINEFUNC(int, EVP_PKEY_param_check, EVP_PKEY_CTX *ctx, ctx, return 0, return)
150
DEFINEFUNC(int, EVP_PKEY_param_check, EVP_PKEY_CTX *ctx, ctx, return 0, return)
150
DEFINEFUNC(void, EVP_PKEY_CTX_free, EVP_PKEY_CTX *ctx, ctx, return, return)
151
DEFINEFUNC(void, EVP_PKEY_CTX_free, EVP_PKEY_CTX *ctx, ctx, return, return)
152
#endif // OPENSSL_NO_DEPRECATED_3_0
151
DEFINEFUNC(int, EVP_PKEY_base_id, EVP_PKEY *a, a, return NID_undef, return)
153
DEFINEFUNC(int, EVP_PKEY_base_id, EVP_PKEY *a, a, return NID_undef, return)
152
DEFINEFUNC(int, RSA_bits, RSA *a, a, return 0, return)
154
DEFINEFUNC(int, RSA_bits, RSA *a, a, return 0, return)
155
#ifndef LIBRESSL_VERSION_NUMBER
153
DEFINEFUNC(int, DSA_bits, DSA *a, a, return 0, return)
156
DEFINEFUNC(int, DSA_bits, DSA *a, a, return 0, return)
154
DEFINEFUNC(int, OPENSSL_sk_num, OPENSSL_STACK *a, a, return -1, return)
157
DEFINEFUNC(int, OPENSSL_sk_num, OPENSSL_STACK *a, a, return -1, return)
155
DEFINEFUNC2(void, OPENSSL_sk_pop_free, OPENSSL_STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
158
DEFINEFUNC2(void, OPENSSL_sk_pop_free, OPENSSL_STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
Lines 157-166 DEFINEFUNC(OPENSSL_STACK *, OPENSSL_sk_new_null, DUMMYARG, DUMMYARG, return null Link Here
157
DEFINEFUNC2(void, OPENSSL_sk_push, OPENSSL_STACK *a, a, void *b, b, return, DUMMYARG)
160
DEFINEFUNC2(void, OPENSSL_sk_push, OPENSSL_STACK *a, a, void *b, b, return, DUMMYARG)
158
DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, return, DUMMYARG)
161
DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, return, DUMMYARG)
159
DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return nullptr, return)
162
DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return nullptr, return)
163
#else
164
DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return)
165
DEFINEFUNC2(void, sk_pop_free, STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
166
DEFINEFUNC(_STACK *, sk_new_null, DUMMYARG, DUMMYARG, return nullptr, return)
167
DEFINEFUNC2(void, sk_push, _STACK *a, a, void *b, b, return, DUMMYARG)
168
DEFINEFUNC(void, sk_free, _STACK *a, a, return, DUMMYARG)
169
DEFINEFUNC2(void *, sk_value, STACK *a, a, int b, b, return nullptr, return)
170
#endif // LIBRESSL_VERSION_NUMBER
160
DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return)
171
DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return)
161
DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return)
172
DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return)
173
#ifdef SSL_SECOP_PEER
162
DEFINEFUNC(int, SSL_CTX_get_security_level, const SSL_CTX *ctx, ctx, return -1, return)
174
DEFINEFUNC(int, SSL_CTX_get_security_level, const SSL_CTX *ctx, ctx, return -1, return)
163
DEFINEFUNC2(void, SSL_CTX_set_security_level, SSL_CTX *ctx, ctx, int level, level, return, return)
175
DEFINEFUNC2(void, SSL_CTX_set_security_level, SSL_CTX *ctx, ctx, int level, level, return, return)
176
#endif //SSL_SECOP_PEER
164
#ifdef TLS1_3_VERSION
177
#ifdef TLS1_3_VERSION
165
DEFINEFUNC2(int, SSL_CTX_set_ciphersuites, SSL_CTX *ctx, ctx, const char *str, str, return 0, return)
178
DEFINEFUNC2(int, SSL_CTX_set_ciphersuites, SSL_CTX *ctx, ctx, const char *str, str, return 0, return)
166
DEFINEFUNC2(void, SSL_set_psk_use_session_callback, SSL *ssl, ssl, q_SSL_psk_use_session_cb_func_t callback, callback, return, DUMMYARG)
179
DEFINEFUNC2(void, SSL_set_psk_use_session_callback, SSL *ssl, ssl, q_SSL_psk_use_session_cb_func_t callback, callback, return, DUMMYARG)
Lines 184-190 DEFINEFUNC2(void, X509_STORE_set_verify_cb, X509_STORE *a, a, X509_STORE_CTX_ver Link Here
184
DEFINEFUNC3(int, X509_STORE_set_ex_data, X509_STORE *a, a, int idx, idx, void *data, data, return 0, return)
197
DEFINEFUNC3(int, X509_STORE_set_ex_data, X509_STORE *a, a, int idx, idx, void *data, data, return 0, return)
185
DEFINEFUNC2(void *, X509_STORE_get_ex_data, X509_STORE *r, r, int idx, idx, return nullptr, return)
198
DEFINEFUNC2(void *, X509_STORE_get_ex_data, X509_STORE *r, r, int idx, idx, return nullptr, return)
186
DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get0_chain, X509_STORE_CTX *a, a, return nullptr, return)
199
DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get0_chain, X509_STORE_CTX *a, a, return nullptr, return)
200
#ifndef LIBRESSL_VERSION_NUMBER
187
DEFINEFUNC3(void, CRYPTO_free, void *str, str, const char *file, file, int line, line, return, DUMMYARG)
201
DEFINEFUNC3(void, CRYPTO_free, void *str, str, const char *file, file, int line, line, return, DUMMYARG)
202
#else
203
DEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG)
204
#endif
188
DEFINEFUNC(long, OpenSSL_version_num, void, DUMMYARG, return 0, return)
205
DEFINEFUNC(long, OpenSSL_version_num, void, DUMMYARG, return 0, return)
189
DEFINEFUNC(const char *, OpenSSL_version, int a, a, return nullptr, return)
206
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)
207
DEFINEFUNC(unsigned long, SSL_SESSION_get_ticket_lifetime_hint, const SSL_SESSION *session, session, return 0, return)
Lines 224-230 DEFINEFUNC5(int, OCSP_id_get0_info, ASN1_OCTET_STRING **piNameHash, piNameHash, Link Here
224
            ASN1_OCTET_STRING **piKeyHash, piKeyHash, ASN1_INTEGER **pserial, pserial, OCSP_CERTID *cid, cid,
241
            ASN1_OCTET_STRING **piKeyHash, piKeyHash, ASN1_INTEGER **pserial, pserial, OCSP_CERTID *cid, cid,
225
            return 0, return)
242
            return 0, return)
226
DEFINEFUNC2(OCSP_RESPONSE *, OCSP_response_create, int status, status, OCSP_BASICRESP *bs, bs, return nullptr, return)
243
DEFINEFUNC2(OCSP_RESPONSE *, OCSP_response_create, int status, status, OCSP_BASICRESP *bs, bs, return nullptr, return)
244
#ifndef LIBRESSL_VERSION_NUMBER
227
DEFINEFUNC(const STACK_OF(X509) *, OCSP_resp_get0_certs, const OCSP_BASICRESP *bs, bs, return nullptr, return)
245
DEFINEFUNC(const STACK_OF(X509) *, OCSP_resp_get0_certs, const OCSP_BASICRESP *bs, bs, return nullptr, return)
246
#endif
228
DEFINEFUNC2(int, OCSP_id_cmp, OCSP_CERTID *a, a, OCSP_CERTID *b, b, return -1, return)
247
DEFINEFUNC2(int, OCSP_id_cmp, OCSP_CERTID *a, a, OCSP_CERTID *b, b, return -1, return)
229
DEFINEFUNC7(OCSP_SINGLERESP *, OCSP_basic_add1_status, OCSP_BASICRESP *r, r, OCSP_CERTID *c, c, int s, s,
248
DEFINEFUNC7(OCSP_SINGLERESP *, OCSP_basic_add1_status, OCSP_BASICRESP *r, r, OCSP_CERTID *c, c, int s, s,
230
            int re, re, ASN1_TIME *rt, rt, ASN1_TIME *t, t, ASN1_TIME *n, n, return nullptr, return)
249
            int re, re, ASN1_TIME *rt, rt, ASN1_TIME *t, t, ASN1_TIME *n, n, return nullptr, return)
Lines 356-367 DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a, EVP_PKEY *b, b, return - Link Here
356
DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return)
375
DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return)
357
DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return)
376
DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return)
358
DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return)
377
DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return)
378
#ifndef LIBRESSL_VERSION_NUMBER
359
DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return nullptr, return);
379
DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return nullptr, return);
360
DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return);
380
DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return);
361
DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX *a, a, SSL_CTX *b, b, return, return);
381
DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX *a, a, SSL_CTX *b, b, return, return);
362
DEFINEFUNC2(unsigned int, SSL_CONF_CTX_set_flags, SSL_CONF_CTX *a, a, unsigned int b, b, return 0, return);
382
DEFINEFUNC2(unsigned int, SSL_CONF_CTX_set_flags, SSL_CONF_CTX *a, a, unsigned int b, b, return 0, return);
363
DEFINEFUNC(int, SSL_CONF_CTX_finish, SSL_CONF_CTX *a, a, return 0, return);
383
DEFINEFUNC(int, SSL_CONF_CTX_finish, SSL_CONF_CTX *a, a, return 0, return);
364
DEFINEFUNC3(int, SSL_CONF_cmd, SSL_CONF_CTX *a, a, const char *b, b, const char *c, c, return 0, return);
384
DEFINEFUNC3(int, SSL_CONF_cmd, SSL_CONF_CTX *a, a, const char *b, b, const char *c, c, return 0, return);
385
#endif
365
DEFINEFUNC(void, SSL_free, SSL *a, a, return, DUMMYARG)
386
DEFINEFUNC(void, SSL_free, SSL *a, a, return, DUMMYARG)
366
DEFINEFUNC(STACK_OF(SSL_CIPHER) *, SSL_get_ciphers, const SSL *a, a, return nullptr, return)
387
DEFINEFUNC(STACK_OF(SSL_CIPHER) *, SSL_get_ciphers, const SSL *a, a, return nullptr, return)
367
DEFINEFUNC(const SSL_CIPHER *, SSL_get_current_cipher, SSL *a, a, return nullptr, return)
388
DEFINEFUNC(const SSL_CIPHER *, SSL_get_current_cipher, SSL *a, a, return nullptr, return)
Lines 845-865 bool q_resolveOpenSslSymbols() Link Here
845
    RESOLVEFUNC(ASN1_STRING_get0_data)
866
    RESOLVEFUNC(ASN1_STRING_get0_data)
846
    RESOLVEFUNC(EVP_CIPHER_CTX_reset)
867
    RESOLVEFUNC(EVP_CIPHER_CTX_reset)
847
    RESOLVEFUNC(EVP_PKEY_up_ref)
868
    RESOLVEFUNC(EVP_PKEY_up_ref)
869
#ifdef OPENSSL_NO_DEPRECATED_3_0
848
    RESOLVEFUNC(EVP_PKEY_CTX_new)
870
    RESOLVEFUNC(EVP_PKEY_CTX_new)
849
    RESOLVEFUNC(EVP_PKEY_param_check)
871
    RESOLVEFUNC(EVP_PKEY_param_check)
850
    RESOLVEFUNC(EVP_PKEY_CTX_free)
872
    RESOLVEFUNC(EVP_PKEY_CTX_free)
873
#endif // OPENSSL_NO_DEPRECATED_3_0
851
    RESOLVEFUNC(EVP_PKEY_base_id)
874
    RESOLVEFUNC(EVP_PKEY_base_id)
852
    RESOLVEFUNC(RSA_bits)
875
    RESOLVEFUNC(RSA_bits)
876
#ifndef LIBRESSL_VERSION_NUMBER
853
    RESOLVEFUNC(OPENSSL_sk_new_null)
877
    RESOLVEFUNC(OPENSSL_sk_new_null)
854
    RESOLVEFUNC(OPENSSL_sk_push)
878
    RESOLVEFUNC(OPENSSL_sk_push)
855
    RESOLVEFUNC(OPENSSL_sk_free)
879
    RESOLVEFUNC(OPENSSL_sk_free)
856
    RESOLVEFUNC(OPENSSL_sk_num)
880
    RESOLVEFUNC(OPENSSL_sk_num)
857
    RESOLVEFUNC(OPENSSL_sk_pop_free)
881
    RESOLVEFUNC(OPENSSL_sk_pop_free)
858
    RESOLVEFUNC(OPENSSL_sk_value)
882
    RESOLVEFUNC(OPENSSL_sk_value)
883
#endif
859
    RESOLVEFUNC(DH_get0_pqg)
884
    RESOLVEFUNC(DH_get0_pqg)
860
    RESOLVEFUNC(SSL_CTX_set_options)
885
    RESOLVEFUNC(SSL_CTX_set_options)
886
#ifdef SSL_SECOP_PEER
861
    RESOLVEFUNC(SSL_CTX_get_security_level)
887
    RESOLVEFUNC(SSL_CTX_get_security_level)
862
    RESOLVEFUNC(SSL_CTX_set_security_level)
888
    RESOLVEFUNC(SSL_CTX_set_security_level)
889
#endif //SSL_SECOP_PEER
863
#ifdef TLS1_3_VERSION
890
#ifdef TLS1_3_VERSION
864
    RESOLVEFUNC(SSL_CTX_set_ciphersuites)
891
    RESOLVEFUNC(SSL_CTX_set_ciphersuites)
865
    RESOLVEFUNC(SSL_set_psk_use_session_callback)
892
    RESOLVEFUNC(SSL_set_psk_use_session_callback)
Lines 898-904 bool q_resolveOpenSslSymbols() Link Here
898
925
899
    RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint)
926
    RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint)
900
    RESOLVEFUNC(DH_bits)
927
    RESOLVEFUNC(DH_bits)
928
#ifndef LIBRESSL_VERSION_NUMBER
901
    RESOLVEFUNC(DSA_bits)
929
    RESOLVEFUNC(DSA_bits)
930
#endif
902
931
903
#if QT_CONFIG(dtls)
932
#if QT_CONFIG(dtls)
904
    RESOLVEFUNC(DTLSv1_listen)
933
    RESOLVEFUNC(DTLSv1_listen)
Lines 928-934 bool q_resolveOpenSslSymbols() Link Here
928
    RESOLVEFUNC(OCSP_check_validity)
957
    RESOLVEFUNC(OCSP_check_validity)
929
    RESOLVEFUNC(OCSP_cert_to_id)
958
    RESOLVEFUNC(OCSP_cert_to_id)
930
    RESOLVEFUNC(OCSP_id_get0_info)
959
    RESOLVEFUNC(OCSP_id_get0_info)
960
#ifndef LIBRESSL_VERSION_NUMBER
931
    RESOLVEFUNC(OCSP_resp_get0_certs)
961
    RESOLVEFUNC(OCSP_resp_get0_certs)
962
#endif
932
    RESOLVEFUNC(OCSP_basic_sign)
963
    RESOLVEFUNC(OCSP_basic_sign)
933
    RESOLVEFUNC(OCSP_response_create)
964
    RESOLVEFUNC(OCSP_response_create)
934
    RESOLVEFUNC(i2d_OCSP_RESPONSE)
965
    RESOLVEFUNC(i2d_OCSP_RESPONSE)
Lines 1058-1069 bool q_resolveOpenSslSymbols() Link Here
1058
    RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey)
1089
    RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey)
1059
    RESOLVEFUNC(SSL_CTX_use_PrivateKey_file)
1090
    RESOLVEFUNC(SSL_CTX_use_PrivateKey_file)
1060
    RESOLVEFUNC(SSL_CTX_get_cert_store);
1091
    RESOLVEFUNC(SSL_CTX_get_cert_store);
1092
#ifndef LIBRESSL_VERSION_NUMBER
1061
    RESOLVEFUNC(SSL_CONF_CTX_new);
1093
    RESOLVEFUNC(SSL_CONF_CTX_new);
1062
    RESOLVEFUNC(SSL_CONF_CTX_free);
1094
    RESOLVEFUNC(SSL_CONF_CTX_free);
1063
    RESOLVEFUNC(SSL_CONF_CTX_set_ssl_ctx);
1095
    RESOLVEFUNC(SSL_CONF_CTX_set_ssl_ctx);
1064
    RESOLVEFUNC(SSL_CONF_CTX_set_flags);
1096
    RESOLVEFUNC(SSL_CONF_CTX_set_flags);
1065
    RESOLVEFUNC(SSL_CONF_CTX_finish);
1097
    RESOLVEFUNC(SSL_CONF_CTX_finish);
1066
    RESOLVEFUNC(SSL_CONF_cmd);
1098
    RESOLVEFUNC(SSL_CONF_cmd);
1099
#endif
1067
    RESOLVEFUNC(SSL_accept)
1100
    RESOLVEFUNC(SSL_accept)
1068
    RESOLVEFUNC(SSL_clear)
1101
    RESOLVEFUNC(SSL_clear)
1069
    RESOLVEFUNC(SSL_connect)
1102
    RESOLVEFUNC(SSL_connect)
(-)a/src/network/ssl/qsslsocket_openssl_symbols_p.h (+47 lines)
Lines 80-85 QT_BEGIN_NAMESPACE Link Here
80
80
81
#define DUMMYARG
81
#define DUMMYARG
82
82
83
#ifdef LIBRESSL_VERSION_NUMBER
84
typedef _STACK STACK;
85
typedef STACK OPENSSL_STACK;
86
typedef void OPENSSL_INIT_SETTINGS;
87
typedef int (*X509_STORE_CTX_verify_cb)(int ok,X509_STORE_CTX *ctx);
88
#endif
89
83
#if !defined QT_LINKED_OPENSSL
90
#if !defined QT_LINKED_OPENSSL
84
// **************** Shared declarations ******************
91
// **************** Shared declarations ******************
85
// ret func(arg)
92
// ret func(arg)
Lines 230-249 const unsigned char * q_ASN1_STRING_get0_data(const ASN1_STRING *x); Link Here
230
Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a);
237
Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a);
231
Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem();
238
Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem();
232
239
240
#ifndef LIBRESSL_VERSION_NUMBER
233
int q_DSA_bits(DSA *a);
241
int q_DSA_bits(DSA *a);
242
#else
243
#define q_DSA_bits(dsa) q_BN_num_bits((dsa)->p)
244
#endif
234
int q_EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c);
245
int q_EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c);
235
Q_AUTOTEST_EXPORT int q_EVP_PKEY_up_ref(EVP_PKEY *a);
246
Q_AUTOTEST_EXPORT int q_EVP_PKEY_up_ref(EVP_PKEY *a);
247
#ifdef OPENSSL_NO_DEPRECATED_3_0
236
EVP_PKEY_CTX *q_EVP_PKEY_CTX_new(EVP_PKEY *pkey, ENGINE *e);
248
EVP_PKEY_CTX *q_EVP_PKEY_CTX_new(EVP_PKEY *pkey, ENGINE *e);
237
void q_EVP_PKEY_CTX_free(EVP_PKEY_CTX *ctx);
249
void q_EVP_PKEY_CTX_free(EVP_PKEY_CTX *ctx);
238
int q_EVP_PKEY_param_check(EVP_PKEY_CTX *ctx);
250
int q_EVP_PKEY_param_check(EVP_PKEY_CTX *ctx);
251
#endif // OPENSSL_NO_DEPRECATED_3_0
239
int q_EVP_PKEY_base_id(EVP_PKEY *a);
252
int q_EVP_PKEY_base_id(EVP_PKEY *a);
240
int q_RSA_bits(RSA *a);
253
int q_RSA_bits(RSA *a);
254
255
#ifndef LIBRESSL_VERSION_NUMBER
241
Q_AUTOTEST_EXPORT int q_OPENSSL_sk_num(OPENSSL_STACK *a);
256
Q_AUTOTEST_EXPORT int q_OPENSSL_sk_num(OPENSSL_STACK *a);
242
Q_AUTOTEST_EXPORT void q_OPENSSL_sk_pop_free(OPENSSL_STACK *a, void (*b)(void *));
257
Q_AUTOTEST_EXPORT void q_OPENSSL_sk_pop_free(OPENSSL_STACK *a, void (*b)(void *));
243
Q_AUTOTEST_EXPORT OPENSSL_STACK *q_OPENSSL_sk_new_null();
258
Q_AUTOTEST_EXPORT OPENSSL_STACK *q_OPENSSL_sk_new_null();
244
Q_AUTOTEST_EXPORT void q_OPENSSL_sk_push(OPENSSL_STACK *st, void *data);
259
Q_AUTOTEST_EXPORT void q_OPENSSL_sk_push(OPENSSL_STACK *st, void *data);
245
Q_AUTOTEST_EXPORT void q_OPENSSL_sk_free(OPENSSL_STACK *a);
260
Q_AUTOTEST_EXPORT void q_OPENSSL_sk_free(OPENSSL_STACK *a);
246
Q_AUTOTEST_EXPORT void * q_OPENSSL_sk_value(OPENSSL_STACK *a, int b);
261
Q_AUTOTEST_EXPORT void * q_OPENSSL_sk_value(OPENSSL_STACK *a, int b);
262
#else // LIBRESSL_VERSION_NUMBER
263
int q_sk_num(STACK *a);
264
#define q_OPENSSL_sk_num(a) q_sk_num(a)
265
void q_sk_pop_free(STACK *a, void (*b)(void *));
266
#define q_OPENSSL_sk_pop_free(a, b) q_sk_pop_free(a, b)
267
STACK *q_sk_new_null();
268
#define q_OPENSSL_sk_new_null() q_sk_new_null()
269
void q_sk_push(STACK *st, void *data);
270
#define q_OPENSSL_sk_push(st, data) q_sk_push(st, data)
271
void q_sk_free(STACK *a);
272
#define q_OPENSSL_sk_free q_sk_free
273
void *q_sk_value(STACK *a, int b);
274
#define q_OPENSSL_sk_value(a, b) q_sk_value(a, b)
275
#endif // LIBRESSL_VERSION_NUMBER
276
247
int q_SSL_session_reused(SSL *a);
277
int q_SSL_session_reused(SSL *a);
248
unsigned long q_SSL_CTX_set_options(SSL_CTX *ctx, unsigned long op);
278
unsigned long q_SSL_CTX_set_options(SSL_CTX *ctx, unsigned long op);
249
int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
279
int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
Lines 269-276 int q_DH_bits(DH *dh); Link Here
269
# define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \
299
# define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \
270
                                                       | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL)
300
                                                       | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL)
271
301
302
#ifndef LIBRESSL_VERSION_NUMBER
272
#define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_OPENSSL_sk_num)(st)
303
#define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_OPENSSL_sk_num)(st)
273
#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_OPENSSL_sk_value)(st, i)
304
#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_OPENSSL_sk_value)(st, i)
305
#else
306
#define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st)
307
#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(st, i)
308
#endif // LIBRESSL_VERSION_NUMBER
274
309
275
#define q_OPENSSL_add_all_algorithms_conf()  q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
310
#define q_OPENSSL_add_all_algorithms_conf()  q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
276
                                                                   | OPENSSL_INIT_ADD_ALL_DIGESTS \
311
                                                                   | OPENSSL_INIT_ADD_ALL_DIGESTS \
Lines 279-285 int q_DH_bits(DH *dh); Link Here
279
                                                                    | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL)
314
                                                                    | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL)
280
315
281
int q_OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
316
int q_OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
317
#ifndef LIBRESSL_VERSION_NUMBER
282
void q_CRYPTO_free(void *str, const char *file, int line);
318
void q_CRYPTO_free(void *str, const char *file, int line);
319
#else
320
void q_CRYPTO_free(void *a);
321
#endif
283
322
284
long q_OpenSSL_version_num();
323
long q_OpenSSL_version_num();
285
const char *q_OpenSSL_version(int type);
324
const char *q_OpenSSL_version(int type);
Lines 497-508 int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b); Link Here
497
int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX *a, RSA *b);
536
int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX *a, RSA *b);
498
int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c);
537
int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c);
499
X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a);
538
X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a);
539
#ifndef LIBRESSL_VERSION_NUMBER
500
SSL_CONF_CTX *q_SSL_CONF_CTX_new();
540
SSL_CONF_CTX *q_SSL_CONF_CTX_new();
501
void q_SSL_CONF_CTX_free(SSL_CONF_CTX *a);
541
void q_SSL_CONF_CTX_free(SSL_CONF_CTX *a);
502
void q_SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *a, SSL_CTX *b);
542
void q_SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *a, SSL_CTX *b);
503
unsigned int q_SSL_CONF_CTX_set_flags(SSL_CONF_CTX *a, unsigned int b);
543
unsigned int q_SSL_CONF_CTX_set_flags(SSL_CONF_CTX *a, unsigned int b);
504
int q_SSL_CONF_CTX_finish(SSL_CONF_CTX *a);
544
int q_SSL_CONF_CTX_finish(SSL_CONF_CTX *a);
505
int q_SSL_CONF_cmd(SSL_CONF_CTX *a, const char *b, const char *c);
545
int q_SSL_CONF_cmd(SSL_CONF_CTX *a, const char *b, const char *c);
546
#endif
506
void q_SSL_free(SSL *a);
547
void q_SSL_free(SSL *a);
507
STACK_OF(SSL_CIPHER) *q_SSL_get_ciphers(const SSL *a);
548
STACK_OF(SSL_CIPHER) *q_SSL_get_ciphers(const SSL *a);
508
const SSL_CIPHER *q_SSL_get_current_cipher(SSL *a);
549
const SSL_CIPHER *q_SSL_get_current_cipher(SSL *a);
Lines 728-734 int q_OCSP_check_validity(ASN1_GENERALIZEDTIME *thisupd, ASN1_GENERALIZEDTIME *n Link Here
728
int q_OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash, ASN1_OBJECT **pmd, ASN1_OCTET_STRING **pikeyHash,
769
int q_OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash, ASN1_OBJECT **pmd, ASN1_OCTET_STRING **pikeyHash,
729
                        ASN1_INTEGER **pserial, OCSP_CERTID *cid);
770
                        ASN1_INTEGER **pserial, OCSP_CERTID *cid);
730
771
772
#ifndef LIBRESSL_VERSION_NUMBER
731
const STACK_OF(X509) *q_OCSP_resp_get0_certs(const OCSP_BASICRESP *bs);
773
const STACK_OF(X509) *q_OCSP_resp_get0_certs(const OCSP_BASICRESP *bs);
774
#else
775
#define q_OCSP_resp_get0_certs(bs) ((bs)->certs)
776
#endif
732
Q_AUTOTEST_EXPORT OCSP_CERTID *q_OCSP_cert_to_id(const EVP_MD *dgst, X509 *subject, X509 *issuer);
777
Q_AUTOTEST_EXPORT OCSP_CERTID *q_OCSP_cert_to_id(const EVP_MD *dgst, X509 *subject, X509 *issuer);
733
Q_AUTOTEST_EXPORT void q_OCSP_CERTID_free(OCSP_CERTID *cid);
778
Q_AUTOTEST_EXPORT void q_OCSP_CERTID_free(OCSP_CERTID *cid);
734
int q_OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b);
779
int q_OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b);
Lines 748-755 int q_OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b); Link Here
748
void *q_CRYPTO_malloc(size_t num, const char *file, int line);
793
void *q_CRYPTO_malloc(size_t num, const char *file, int line);
749
#define q_OPENSSL_malloc(num) q_CRYPTO_malloc(num, "", 0)
794
#define q_OPENSSL_malloc(num) q_CRYPTO_malloc(num, "", 0)
750
795
796
#ifdef SSL_SECOP_PEER
751
int q_SSL_CTX_get_security_level(const SSL_CTX *ctx);
797
int q_SSL_CTX_get_security_level(const SSL_CTX *ctx);
752
void q_SSL_CTX_set_security_level(SSL_CTX *ctx, int level);
798
void q_SSL_CTX_set_security_level(SSL_CTX *ctx, int level);
799
#endif //SSL_SECOP_PEER
753
800
754
QT_END_NAMESPACE
801
QT_END_NAMESPACE
755
802

Return to bug 562050