Skip to content

Commit ca78fae

Browse files
Merge pull request #348 from miyazakh/qt_jenkins_10795
Removes the wolfSSL-specific QSKIP hunk for Qt certificate unit test
2 parents 1e9e213 + 444a949 commit ca78fae

1 file changed

Lines changed: 1 addition & 13 deletions

File tree

qt/wolfssl-qt-51518-full.patch

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -515,19 +515,7 @@ index fb268228943..7db754c42d7 100644
515515
class tst_QSslCertificate : public QObject
516516
{
517517
Q_OBJECT
518-
@@ -992,6 +996,11 @@ void tst_QSslCertificate::nulInSan()
519-
#endif
520-
QList<QSslCertificate> certList =
521-
QSslCertificate::fromPath(testDataDir + "more-certificates/badguy-nul-san.crt", QSsl::Pem, QSslCertificate::PatternSyntax::FixedString);
522-
+#ifndef QT_NO_WOLFSSL
523-
+ // wolfSSL (PR#10279) rejects certificates with embedded NUL bytes in SAN DNS entries at parse time
524-
+ if (certList.isEmpty())
525-
+ QSKIP("wolfSSL rejects certificates with embedded NUL bytes in SAN DNS entries");
526-
+#endif
527-
QCOMPARE(certList.size(), 1);
528-
529-
const QSslCertificate &cert = certList.at(0);
530-
@@ -1081,7 +1090,9 @@ void tst_QSslCertificate::multipleCommonNames()
518+
@@ -1081,7 +1085,9 @@ void tst_QSslCertificate::multipleCommonNames()
531519
QList<QSslCertificate> certList =
532520
QSslCertificate::fromPath(testDataDir + "more-certificates/test-cn-two-cns-cert.pem", QSsl::Pem, QSslCertificate::PatternSyntax::FixedString);
533521
QVERIFY(certList.count() > 0);

0 commit comments

Comments
 (0)