Submitted by: Douglas R. Reno Date: 2026-05-13 Initial Package Version: 6.11.0 Upstream Status: Pending Origin: https://codereview.qt-project.org/c/qt/qtbase/+/725635 Description: Fixes building Qt6 with OpenSSL-4 by adjusting it to use the correct const types, using the correct syntax for ASN1_STRING_*, and using ASN_STRING_* instead of accessing certain data directly. From 4500347f861a2a606540ab7d01f074ef1e8bb57d Mon Sep 17 00:00:00 2001 From: Mårten Nordheim Date: Thu, 26 Mar 2026 15:45:13 +0100 Subject: [PATCH] wip Update sources to support OpenSSL 4 It's mostly compatible with the existing code, but a few source-breaks to enforce const-correctness was done. And that's the majority of the changes seen here. Pick-to: 6.11 6.8 Change-Id: Ic3f7d3cf00dbcb5b4cd1a299d3608a7c694a3454 --- diff --git a/src/plugins/tls/openssl/qopenssl_p.h b/src/plugins/tls/openssl/qopenssl_p.h index 1f946a4..724103a 100644 --- a/src/plugins/tls/openssl/qopenssl_p.h +++ b/src/plugins/tls/openssl/qopenssl_p.h @@ -69,6 +69,12 @@ #include #include +#if defined(OPENSSL_VERSION_MAJOR) && OPENSSL_VERSION_MAJOR >= 4 +#define QT_OPENSSL4_CONST const +#else +#define QT_OPENSSL4_CONST +#endif + QT_BEGIN_NAMESPACE struct QSslErrorEntry { diff --git a/src/plugins/tls/openssl/qsslsocket_openssl_symbols.cpp b/src/plugins/tls/openssl/qsslsocket_openssl_symbols.cpp index 54ef9a1..373f162 100644 --- a/src/plugins/tls/openssl/qsslsocket_openssl_symbols.cpp +++ b/src/plugins/tls/openssl/qsslsocket_openssl_symbols.cpp @@ -214,8 +214,8 @@ DEFINEFUNC(long, ASN1_INTEGER_get, ASN1_INTEGER *a, a, return 0, return) DEFINEFUNC2(int, ASN1_INTEGER_cmp, const ASN1_INTEGER *a, a, const ASN1_INTEGER *b, b, return 1, return) -DEFINEFUNC(int, ASN1_STRING_length, ASN1_STRING *a, a, return 0, return) -DEFINEFUNC2(int, ASN1_STRING_to_UTF8, unsigned char **a, a, ASN1_STRING *b, b, return 0, return) +DEFINEFUNC(int, ASN1_STRING_length, const ASN1_STRING *a, a, return 0, return) +DEFINEFUNC2(int, ASN1_STRING_to_UTF8, unsigned char **a, a, const ASN1_STRING *b, b, return 0, return) DEFINEFUNC2(int, ASN1_TIME_to_tm, const ASN1_TIME *s, s, struct tm *tm, tm, return 0, return) DEFINEFUNC4(long, BIO_ctrl, BIO *a, a, int b, b, long c, c, void *d, d, return -1, return) DEFINEFUNC(int, BIO_free, BIO *a, a, return 0, return) @@ -260,7 +260,7 @@ DEFINEFUNC(int, OBJ_sn2nid, const char *s, s, return 0, return) DEFINEFUNC(int, OBJ_ln2nid, const char *s, s, return 0, return) DEFINEFUNC3(int, i2t_ASN1_OBJECT, char *a, a, int b, b, ASN1_OBJECT *c, c, return -1, return) -DEFINEFUNC4(int, OBJ_obj2txt, char *a, a, int b, b, ASN1_OBJECT *c, c, int d, d, return -1, return) +DEFINEFUNC4(int, OBJ_obj2txt, char *a, a, int b, b, const ASN1_OBJECT *c, c, int d, d, return -1, return) DEFINEFUNC(int, OBJ_obj2nid, const ASN1_OBJECT *a, a, return NID_undef, return) DEFINEFUNC4(EVP_PKEY *, PEM_read_bio_PrivateKey, BIO *a, a, EVP_PKEY **b, b, pem_password_cb *c, c, void *d, d, return nullptr, return) @@ -344,31 +344,31 @@ DEFINEFUNC4(int, X509_digest, const X509 *x509, x509, const EVP_MD *type, type, unsigned char *md, md, unsigned int *len, len, return -1, return) DEFINEFUNC(X509 *, X509_dup, X509 *a, a, return nullptr, return) DEFINEFUNC2(void, X509_print, BIO *a, a, X509 *b, b, return, DUMMYARG); -DEFINEFUNC(ASN1_OBJECT *, X509_EXTENSION_get_object, X509_EXTENSION *a, a, return nullptr, return) +DEFINEFUNC(QT_OPENSSL4_CONST ASN1_OBJECT *, X509_EXTENSION_get_object, QT_OPENSSL4_CONST X509_EXTENSION *a, a, return nullptr, return) DEFINEFUNC(void, X509_free, X509 *a, a, return, DUMMYARG) //Q_AUTOTEST_EXPORT ASN1_TIME *q_X509_gmtime_adj(ASN1_TIME *s, long adj); DEFINEFUNC2(ASN1_TIME *, X509_gmtime_adj, ASN1_TIME *s, s, long adj, adj, return nullptr, return) DEFINEFUNC(void, ASN1_TIME_free, ASN1_TIME *t, t, return, DUMMYARG) -DEFINEFUNC2(X509_EXTENSION *, X509_get_ext, X509 *a, a, int b, b, return nullptr, return) +DEFINEFUNC2(QT_OPENSSL4_CONST X509_EXTENSION *, X509_get_ext, X509 *a, a, int b, b, return nullptr, return) DEFINEFUNC(int, X509_get_ext_count, X509 *a, a, return 0, return) DEFINEFUNC4(void *, X509_get_ext_d2i, X509 *a, a, int b, b, int *c, c, int *d, d, return nullptr, return) -DEFINEFUNC(const X509V3_EXT_METHOD *, X509V3_EXT_get, X509_EXTENSION *a, a, return nullptr, return) -DEFINEFUNC(void *, X509V3_EXT_d2i, X509_EXTENSION *a, a, return nullptr, return) -DEFINEFUNC(int, X509_EXTENSION_get_critical, X509_EXTENSION *a, a, return 0, return) -DEFINEFUNC(ASN1_OCTET_STRING *, X509_EXTENSION_get_data, X509_EXTENSION *a, a, return nullptr, return) +DEFINEFUNC(const X509V3_EXT_METHOD *, X509V3_EXT_get, QT_OPENSSL4_CONST X509_EXTENSION *a, a, return nullptr, return) +DEFINEFUNC(void *, X509V3_EXT_d2i, QT_OPENSSL4_CONST X509_EXTENSION *a, a, return nullptr, return) +DEFINEFUNC(int, X509_EXTENSION_get_critical, const X509_EXTENSION *a, a, return 0, return) +DEFINEFUNC(QT_OPENSSL4_CONST ASN1_OCTET_STRING *, X509_EXTENSION_get_data, QT_OPENSSL4_CONST X509_EXTENSION *a, a, return nullptr, return) DEFINEFUNC(void, BASIC_CONSTRAINTS_free, BASIC_CONSTRAINTS *a, a, return, DUMMYARG) DEFINEFUNC(void, AUTHORITY_KEYID_free, AUTHORITY_KEYID *a, a, return, DUMMYARG) DEFINEFUNC(void, GENERAL_NAME_free, GENERAL_NAME *a, a, return, DUMMYARG) DEFINEFUNC2(int, ASN1_STRING_print, BIO *a, a, const ASN1_STRING *b, b, return 0, return) DEFINEFUNC2(int, X509_check_issued, X509 *a, a, X509 *b, b, return -1, return) -DEFINEFUNC(X509_NAME *, X509_get_issuer_name, X509 *a, a, return nullptr, return) -DEFINEFUNC(X509_NAME *, X509_get_subject_name, X509 *a, a, return nullptr, return) +DEFINEFUNC(QT_OPENSSL4_CONST X509_NAME *, X509_get_issuer_name, X509 *a, a, return nullptr, return) +DEFINEFUNC(QT_OPENSSL4_CONST X509_NAME *, X509_get_subject_name, X509 *a, a, return nullptr, return) DEFINEFUNC(ASN1_INTEGER *, X509_get_serialNumber, X509 *a, a, return nullptr, return) DEFINEFUNC(int, X509_verify_cert, X509_STORE_CTX *a, a, return -1, return) -DEFINEFUNC(int, X509_NAME_entry_count, X509_NAME *a, a, return 0, return) -DEFINEFUNC2(X509_NAME_ENTRY *, X509_NAME_get_entry, X509_NAME *a, a, int b, b, return nullptr, return) -DEFINEFUNC(ASN1_STRING *, X509_NAME_ENTRY_get_data, X509_NAME_ENTRY *a, a, return nullptr, return) -DEFINEFUNC(ASN1_OBJECT *, X509_NAME_ENTRY_get_object, X509_NAME_ENTRY *a, a, return nullptr, return) +DEFINEFUNC(int, X509_NAME_entry_count, const X509_NAME *a, a, return 0, return) +DEFINEFUNC2(QT_OPENSSL4_CONST X509_NAME_ENTRY *, X509_NAME_get_entry, const X509_NAME *a, a, int b, b, return nullptr, return) +DEFINEFUNC(QT_OPENSSL4_CONST ASN1_STRING *, X509_NAME_ENTRY_get_data, const X509_NAME_ENTRY *a, a, return nullptr, return) +DEFINEFUNC(QT_OPENSSL4_CONST ASN1_OBJECT *, X509_NAME_ENTRY_get_object, const X509_NAME_ENTRY *a, a, return nullptr, return) DEFINEFUNC(EVP_PKEY *, X509_PUBKEY_get, X509_PUBKEY *a, a, return nullptr, return) DEFINEFUNC(void, X509_STORE_free, X509_STORE *a, a, return, DUMMYARG) DEFINEFUNC(X509_STORE *, X509_STORE_new, DUMMYARG, DUMMYARG, return nullptr, return) @@ -655,9 +655,9 @@ #if (OPENSSL_VERSION_NUMBER >> 28) < 3 #define QT_OPENSSL_VERSION "1_1" -#elif OPENSSL_VERSION_MAJOR == 3 // Starting with 3.0 this define is available -#define QT_OPENSSL_VERSION "3" -#endif // > 3 intentionally left undefined +#elif OPENSSL_VERSION_MAJOR >= 3 +#define QT_OPENSSL_VERSION QT_STRINGIFY(OPENSSL_VERSION_MAJOR) +#endif #ifdef Q_OS_WIN diff --git a/src/plugins/tls/openssl/qsslsocket_openssl_symbols_p.h b/src/plugins/tls/openssl/qsslsocket_openssl_symbols_p.h index 4d9079b..bb575cd 100644 --- a/src/plugins/tls/openssl/qsslsocket_openssl_symbols_p.h +++ b/src/plugins/tls/openssl/qsslsocket_openssl_symbols_p.h @@ -350,8 +350,8 @@ bool q_resolveOpenSslSymbols(); long q_ASN1_INTEGER_get(ASN1_INTEGER *a); int q_ASN1_INTEGER_cmp(const ASN1_INTEGER *x, const ASN1_INTEGER *y); -int q_ASN1_STRING_length(ASN1_STRING *a); -int q_ASN1_STRING_to_UTF8(unsigned char **a, ASN1_STRING *b); +int q_ASN1_STRING_length(const ASN1_STRING *a); +int q_ASN1_STRING_to_UTF8(unsigned char **a, const ASN1_STRING *b); int q_ASN1_TIME_to_tm(const ASN1_TIME *s, struct tm *tm); long q_BIO_ctrl(BIO *a, int b, long c, void *d); int q_BIO_free(BIO *a); @@ -402,7 +402,7 @@ int q_OBJ_sn2nid(const char *s); int q_OBJ_ln2nid(const char *s); int q_i2t_ASN1_OBJECT(char *buf, int buf_len, ASN1_OBJECT *obj); -int q_OBJ_obj2txt(char *buf, int buf_len, ASN1_OBJECT *obj, int no_name); +int q_OBJ_obj2txt(char *buf, int buf_len, const ASN1_OBJECT *obj, int no_name); int q_OBJ_obj2nid(const ASN1_OBJECT *a); #define q_EVP_get_digestbynid(a) q_EVP_get_digestbyname(q_OBJ_nid2sn(a)) EVP_PKEY *q_PEM_read_bio_PrivateKey(BIO *a, EVP_PKEY **b, pem_password_cb *c, void *d); @@ -481,29 +481,29 @@ X509 *q_X509_dup(X509 *a); void q_X509_print(BIO *a, X509*b); int q_X509_digest(const X509 *x509, const EVP_MD *type, unsigned char *md, unsigned int *len); -ASN1_OBJECT *q_X509_EXTENSION_get_object(X509_EXTENSION *a); +QT_OPENSSL4_CONST ASN1_OBJECT *q_X509_EXTENSION_get_object(QT_OPENSSL4_CONST X509_EXTENSION *a); void q_X509_free(X509 *a); ASN1_TIME *q_X509_gmtime_adj(ASN1_TIME *s, long adj); void q_ASN1_TIME_free(ASN1_TIME *t); -X509_EXTENSION *q_X509_get_ext(X509 *a, int b); +QT_OPENSSL4_CONST X509_EXTENSION *q_X509_get_ext(X509 *a, int b); int q_X509_get_ext_count(X509 *a); void *q_X509_get_ext_d2i(X509 *a, int b, int *c, int *d); -const X509V3_EXT_METHOD *q_X509V3_EXT_get(X509_EXTENSION *a); -void *q_X509V3_EXT_d2i(X509_EXTENSION *a); -int q_X509_EXTENSION_get_critical(X509_EXTENSION *a); -ASN1_OCTET_STRING *q_X509_EXTENSION_get_data(X509_EXTENSION *a); +const X509V3_EXT_METHOD *q_X509V3_EXT_get(QT_OPENSSL4_CONST X509_EXTENSION *a); +void *q_X509V3_EXT_d2i(QT_OPENSSL4_CONST X509_EXTENSION *a); +int q_X509_EXTENSION_get_critical(const X509_EXTENSION *a); +QT_OPENSSL4_CONST ASN1_OCTET_STRING *q_X509_EXTENSION_get_data(QT_OPENSSL4_CONST X509_EXTENSION *a); void q_BASIC_CONSTRAINTS_free(BASIC_CONSTRAINTS *a); void q_AUTHORITY_KEYID_free(AUTHORITY_KEYID *a); int q_ASN1_STRING_print(BIO *a, const ASN1_STRING *b); int q_X509_check_issued(X509 *a, X509 *b); -X509_NAME *q_X509_get_issuer_name(X509 *a); -X509_NAME *q_X509_get_subject_name(X509 *a); +QT_OPENSSL4_CONST X509_NAME *q_X509_get_issuer_name(X509 *a); +QT_OPENSSL4_CONST X509_NAME *q_X509_get_subject_name(X509 *a); ASN1_INTEGER *q_X509_get_serialNumber(X509 *a); int q_X509_verify_cert(X509_STORE_CTX *ctx); -int q_X509_NAME_entry_count(X509_NAME *a); -X509_NAME_ENTRY *q_X509_NAME_get_entry(X509_NAME *a,int b); -ASN1_STRING *q_X509_NAME_ENTRY_get_data(X509_NAME_ENTRY *a); -ASN1_OBJECT *q_X509_NAME_ENTRY_get_object(X509_NAME_ENTRY *a); +int q_X509_NAME_entry_count(const X509_NAME *a); +QT_OPENSSL4_CONST X509_NAME_ENTRY *q_X509_NAME_get_entry(const X509_NAME *a, int b); +QT_OPENSSL4_CONST ASN1_STRING *q_X509_NAME_ENTRY_get_data(const X509_NAME_ENTRY *a); +QT_OPENSSL4_CONST ASN1_OBJECT *q_X509_NAME_ENTRY_get_object(const X509_NAME_ENTRY *a); EVP_PKEY *q_X509_PUBKEY_get(X509_PUBKEY *a); void q_X509_STORE_free(X509_STORE *store); X509_STORE *q_X509_STORE_new(); diff --git a/src/plugins/tls/openssl/qx509_openssl.cpp b/src/plugins/tls/openssl/qx509_openssl.cpp index 5586717..919fbfe 100644 --- a/src/plugins/tls/openssl/qx509_openssl.cpp +++ b/src/plugins/tls/openssl/qx509_openssl.cpp @@ -29,7 +29,7 @@ namespace { -QByteArray asn1ObjectId(ASN1_OBJECT *object) +QByteArray asn1ObjectId(const ASN1_OBJECT *object) { if (!object) return {}; @@ -40,7 +40,7 @@ return QByteArray(buf); } -QByteArray asn1ObjectName(ASN1_OBJECT *object) +QByteArray asn1ObjectName(const ASN1_OBJECT *object) { if (!object) return {}; @@ -52,14 +52,14 @@ return asn1ObjectId(object); } -QMultiMap mapFromX509Name(X509_NAME *name) +QMultiMap mapFromX509Name(const X509_NAME *name) { if (!name) return {}; QMultiMap info; for (int i = 0; i < q_X509_NAME_entry_count(name); ++i) { - X509_NAME_ENTRY *e = q_X509_NAME_get_entry(name, i); + const X509_NAME_ENTRY *e = q_X509_NAME_get_entry(name, i); QByteArray name = asn1ObjectName(q_X509_NAME_ENTRY_get_object(e)); unsigned char *data = nullptr; @@ -147,7 +147,7 @@ return QString::fromLatin1(result); } -QVariant x509UnknownExtensionToValue(X509_EXTENSION *ext) +QVariant x509UnknownExtensionToValue(QT_OPENSSL4_CONST X509_EXTENSION *ext) { // Get the extension specific method object if available // we cast away the const-ness here because some versions of openssl @@ -157,7 +157,7 @@ X509V3_EXT_METHOD *meth = const_cast(q_X509V3_EXT_get(ext)); if (!meth) { - ASN1_OCTET_STRING *value = q_X509_EXTENSION_get_data(ext); + QT_OPENSSL4_CONST ASN1_OCTET_STRING *value = q_X509_EXTENSION_get_data(ext); Q_ASSERT(value); QByteArray result( reinterpret_cast(q_ASN1_STRING_get0_data(value)), q_ASN1_STRING_length(value)); @@ -237,9 +237,9 @@ * taken from RFC 5280, however we decided the capitalisation in the RFC * was too silly for the real world. */ -QVariant x509ExtensionToValue(X509_EXTENSION *ext) +QVariant x509ExtensionToValue(QT_OPENSSL4_CONST X509_EXTENSION *ext) { - ASN1_OBJECT *obj = q_X509_EXTENSION_get_object(ext); + QT_OPENSSL4_CONST ASN1_OBJECT *obj = q_X509_EXTENSION_get_object(ext); int nid = q_OBJ_obj2nid(obj); // We cast away the const-ness here because some versions of openssl @@ -330,8 +330,9 @@ // keyid if (auth_key->keyid) { - QByteArray keyid(reinterpret_cast(auth_key->keyid->data), - auth_key->keyid->length); + const unsigned char *data = q_ASN1_STRING_get0_data(auth_key->keyid); + int length = q_ASN1_STRING_length(auth_key->keyid); + QByteArray keyid(reinterpret_cast(data), length); result["keyid"_L1] = keyid.toHex(); } @@ -465,10 +466,10 @@ QHostAddress ipAddress; switch (len) { case 4: // IPv4 - ipAddress = QHostAddress(qFromBigEndian(*reinterpret_cast(genName->d.iPAddress->data))); + ipAddress = QHostAddress(qFromBigEndian(*reinterpret_cast(q_ASN1_STRING_get0_data(genName->d.iPAddress)))); break; case 16: // IPv6 - ipAddress = QHostAddress(reinterpret_cast(genName->d.iPAddress->data)); + ipAddress = QHostAddress(reinterpret_cast(q_ASN1_STRING_get0_data(genName->d.iPAddress))); break; default: // Unknown IP address format break; @@ -562,9 +563,11 @@ if (ASN1_INTEGER *serialNumber = q_X509_get_serialNumber(x509)) { QByteArray hexString; - hexString.reserve(serialNumber->length * 3); - for (int a = 0; a < serialNumber->length; ++a) { - hexString += QByteArray::number(serialNumber->data[a], 16).rightJustified(2, '0'); + const unsigned char *serialNumberData = q_ASN1_STRING_get0_data(serialNumber); + auto serialNumberLength = qsizetype(q_ASN1_STRING_length(serialNumber)); + hexString.reserve(serialNumberLength * 3); + for (int a = 0; a < serialNumberLength; ++a) { + hexString += QByteArray::number(serialNumberData[a], 16).rightJustified(2, '0'); hexString += ':'; } hexString.chop(1); @@ -898,7 +901,7 @@ extensions.reserve(count); for (int i = 0; i < count; i++) { - X509_EXTENSION *ext = q_X509_get_ext(x509, i); + QT_OPENSSL4_CONST X509_EXTENSION *ext = q_X509_get_ext(x509, i); if (!ext) { qCWarning(lcTlsBackend) << "Invalid (nullptr) extension at index" << i; continue; @@ -911,13 +914,13 @@ QTlsBackendOpenSSL::clearErrorQueue(); } -X509CertificateBase::X509CertificateExtension X509CertificateOpenSSL::convertExtension(X509_EXTENSION *ext) +X509CertificateBase::X509CertificateExtension X509CertificateOpenSSL::convertExtension(QT_OPENSSL4_CONST X509_EXTENSION *ext) { Q_ASSERT(ext); X509CertificateExtension result; - ASN1_OBJECT *obj = q_X509_EXTENSION_get_object(ext); + QT_OPENSSL4_CONST ASN1_OBJECT *obj = q_X509_EXTENSION_get_object(ext); if (!obj) return result; diff --git a/src/plugins/tls/openssl/qx509_openssl_p.h b/src/plugins/tls/openssl/qx509_openssl_p.h index 8d5c1c7..e070a5d 100644 --- a/src/plugins/tls/openssl/qx509_openssl_p.h +++ b/src/plugins/tls/openssl/qx509_openssl_p.h @@ -72,7 +72,7 @@ static QSslError openSSLErrorToQSslError(int errorCode, const QSslCertificate &cert); private: void parseExtensions(); - static X509CertificateExtension convertExtension(X509_EXTENSION *ext); + static X509CertificateExtension convertExtension(QT_OPENSSL4_CONST X509_EXTENSION *ext); X509 *x509 = nullptr; diff --git a/tests/auto/network/ssl/qsslcertificate/more-certificates/cert-large-expiration-date.txt.4.0.0 b/tests/auto/network/ssl/qsslcertificate/more-certificates/cert-large-expiration-date.txt.4.0.0 new file mode 100644 index 0000000..baa04ba --- /dev/null +++ b/tests/auto/network/ssl/qsslcertificate/more-certificates/cert-large-expiration-date.txt.4.0.0 @@ -0,0 +1,39 @@ +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + ce:db:31:28:45:c4:05:40 + Signature Algorithm: sha1WithRSAEncryption + Issuer: C=AU, ST=Some-State, O=Internet Widgits Pty Ltd + Validity + Not Before: Aug 4 09:53:41 2010 GMT + Not After : Aug 29 09:53:41 2051 GMT + Subject: C=AU, ST=Some-State, O=Internet Widgits Pty Ltd + Subject Public Key Info: + Public Key Algorithm: rsaEncryption + Public-Key: (1024 bit) + Modulus: + cd:aa:db:6f:d6:34:c9:a7:f1:c0:be:e4:41:18:19:e2: + 02:c9:22:e6:a7:d5:ba:03:2e:9e:28:7a:f4:5f:1a:77: + 5f:77:a9:11:3b:8f:7e:f0:2e:c6:9e:eb:3a:d9:12:d7: + c1:0c:51:e8:24:52:3f:23:c3:42:0c:11:c6:f2:1c:a1: + 42:fe:b4:c2:69:83:ad:f7:70:b1:18:15:cc:20:28:62: + 30:f0:2c:15:e6:33:19:af:c3:eb:1c:c0:91:f7:11:68: + 94:50:f8:49:37:08:32:d7:3e:75:df:a3:bc:69:00:15: + de:cd:87:0f:5c:02:6b:82:c8:01:7d:6a:f0:1d:dc:73 + Exponent: 65537 (0x10001) + X509v3 extensions: + X509v3 Subject Key Identifier: + 8A:6E:19:E7:97:9B:8F:D9:7F:B3:BB:01:4F:E8:6A:2F:52:95:0D:D9 + X509v3 Authority Key Identifier: + 8A:6E:19:E7:97:9B:8F:D9:7F:B3:BB:01:4F:E8:6A:2F:52:95:0D:D9 + X509v3 Basic Constraints: + CA:TRUE + Signature Algorithm: sha1WithRSAEncryption + Signature Value: + a1:74:8e:5d:36:96:2c:05:7e:ea:66:cc:2e:68:c7:3d:93:dc:8c:a3:11:ad:b5:7e: + 6e:d0:04:c4:09:bd:0a:f9:39:3b:97:d7:f0:bb:0c:09:7b:83:fe:bf:87:b0:47:e8: + 94:b7:aa:9c:79:ad:71:9e:b7:c4:99:98:6f:1d:38:32:f8:a3:75:38:c4:e5:e7:37: + 37:21:ec:7b:50:8b:15:b0:97:1e:17:9c:50:17:3c:c1:df:94:55:fb:60:2e:50:40: + d1:ea:23:c6:3c:21:6f:97:8c:06:16:a5:82:72:c1:63:14:64:86:eb:d7:ff:72:f6: + 09:f5:6d:e6:04:13:7a:6a diff --git a/tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp b/tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp index c26fe97..f53fe24 100644 --- a/tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp +++ b/tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp @@ -1063,10 +1063,15 @@ QVERIFY(f305.open(QIODevice::ReadOnly | QFile::Text)); QByteArray txt305 = f305.readAll(); + QFile f400(testDataDir + "more-certificates/cert-large-expiration-date.txt.4.0.0"); + QVERIFY(f400.open(QIODevice::ReadOnly | QFile::Text)); + QByteArray txt400 = f400.readAll(); + QString txtcert = cert.toText(); - QVERIFY(QString::fromLatin1(txt111) == txtcert || - QString::fromLatin1(txt305) == txtcert); + QVERIFY2(QString::fromLatin1(txt111) == txtcert || + QString::fromLatin1(txt305) == txtcert || + QString::fromLatin1(txt400) == txtcert, u"Unexpected output: %1"_s.arg(txtcert).toUtf8().data()); } void tst_QSslCertificate::multipleCommonNames() diff --git a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp index ee1043b..1e50fe0 100644 --- a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp +++ b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp @@ -3621,6 +3621,7 @@ if (cipher.isNull()) QSKIP("The current backend doesn't support ECDHE-RSA-AES128-SHA"); server.ciphers = {cipher}; + server.protocol = QSsl::TlsV1_2; QVERIFY(server.listen()); QEventLoop loop; @@ -3632,6 +3633,10 @@ connect(socket, SIGNAL(sslErrors(QList)), this, SLOT(ignoreErrorSlot())); connect(socket, SIGNAL(encrypted()), &loop, SLOT(quit())); + QSslConfiguration config = client.sslConfiguration(); + config.setProtocol(QSsl::TlsV1_2); + client.setSslConfiguration(config); + client.connectToHostEncrypted(QHostAddress(QHostAddress::LocalHost).toString(), server.serverPort()); loop.exec(); diff --git a/tests/auto/network/ssl/shared/qopenssl_symbols.h b/tests/auto/network/ssl/shared/qopenssl_symbols.h index c98e90d..967bfea 100644 --- a/tests/auto/network/ssl/shared/qopenssl_symbols.h +++ b/tests/auto/network/ssl/shared/qopenssl_symbols.h @@ -93,6 +93,12 @@ #include #endif // ocsp +#if defined(OPENSSL_VERSION_MAJOR) && OPENSSL_VERSION_MAJOR >= 4 +#define QT_OPENSSL4_CONST const +#else +#define QT_OPENSSL4_CONST +#endif + QT_BEGIN_NAMESPACE namespace { @@ -143,10 +149,11 @@ int status, int reason, ASN1_TIME *revtime, ASN1_TIME *thisupd, ASN1_TIME *nextupd); int q_OCSP_basic_sign(OCSP_BASICRESP *brsp, X509 *signer, EVP_PKEY *key, const EVP_MD *dgst, - STACK_OF(X509) *certs, unsigned long flags); + const STACK_OF(X509) *certs, unsigned long flags); OCSP_BASICRESP *q_OCSP_BASICRESP_new(); void q_OCSP_BASICRESP_free(OCSP_BASICRESP *bs); -OCSP_CERTID *q_OCSP_cert_to_id(const EVP_MD *dgst, X509 *subject, X509 *issuer); +OCSP_CERTID *q_OCSP_cert_to_id(const EVP_MD *dgst, QT_OPENSSL4_CONST X509 *subject, + QT_OPENSSL4_CONST X509 *issuer); void q_OCSP_CERTID_free(OCSP_CERTID *cid); #endif // QT_CONFIG(ocsp) @@ -356,10 +363,12 @@ 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) DEFINEFUNC6(int, OCSP_basic_sign, OCSP_BASICRESP *br, br, X509 *signer, signer, EVP_PKEY *key, key, - const EVP_MD *dg, dg, STACK_OF(X509) *cs, cs, unsigned long flags, flags, return 0, return) + const EVP_MD *dg, dg, const STACK_OF(X509) *cs, cs, unsigned long flags, flags, return 0, return) DEFINEFUNC(OCSP_BASICRESP *, OCSP_BASICRESP_new, DUMMYARG, DUMMYARG, return nullptr, return) DEFINEFUNC(void, OCSP_BASICRESP_free, OCSP_BASICRESP *bs, bs, return, DUMMYARG) -DEFINEFUNC3(OCSP_CERTID *, OCSP_cert_to_id, const EVP_MD *dgst, dgst, X509 *subject, subject, X509 *issuer, issuer, return nullptr, return) +DEFINEFUNC3(OCSP_CERTID *, OCSP_cert_to_id, const EVP_MD *dgst, dgst, + QT_OPENSSL4_CONST X509 *subject, subject, QT_OPENSSL4_CONST X509 *issuer, issuer, + return nullptr, return) DEFINEFUNC(void, OCSP_CERTID_free, OCSP_CERTID *cid, cid, return, DUMMYARG) #endif // QT_CONFIG(ocsp) @@ -504,9 +513,9 @@ #if (OPENSSL_VERSION_NUMBER >> 28) < 3 #define QT_OPENSSL_VERSION "1_1" -#elif OPENSSL_VERSION_MAJOR == 3 // Starting with 3.0 this define is available -#define QT_OPENSSL_VERSION "3" -#endif // > 3 intentionally left undefined +#elif OPENSSL_VERSION_MAJOR >= 3 +#define QT_OPENSSL_VERSION QT_STRINGIFY(OPENSSL_VERSION_MAJOR) +#endif struct LoadedOpenSsl { std::unique_ptr ssl, crypto;