diff options
| author | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2020-11-12 13:20:51 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-12-01 22:15:24 +0000 |
| commit | 59dfbfb8ab875885e607f93639970922b494d8a7 (patch) | |
| tree | 6398cfad09a4fe28502eee11c189b5b64cd43e74 | |
| parent | ccc763aef1d4c69b8da8f7cd0b64d3f2f6a10e86 (diff) | |
tst_qsslkey - handle QT_NO_SSL properly
The recent change handling missing elliptic curves introduced a problem
for '-no-ssl' configuration/build. The first version had some protection,
but it was openssl-specific and required a private feature, thus was
removed. Now the real ifdef must be with QT_NO_SSL
Fixes: QTBUG-88238
Change-Id: I6fba26d6ab63850e1468e76f8b234703255a026c
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
(cherry picked from commit 9662ff67cefe5882a07752dee97735ad36f40a15)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | tests/auto/network/ssl/qsslkey/tst_qsslkey.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/auto/network/ssl/qsslkey/tst_qsslkey.cpp b/tests/auto/network/ssl/qsslkey/tst_qsslkey.cpp index 8ff6d35ba2..d91d93d9ab 100644 --- a/tests/auto/network/ssl/qsslkey/tst_qsslkey.cpp +++ b/tests/auto/network/ssl/qsslkey/tst_qsslkey.cpp @@ -117,6 +117,7 @@ private: tst_QSslKey::tst_QSslKey() { +#ifndef QT_NO_SSL const QString expectedCurves[] = { // See how we generate them in keys/genkey.sh. QStringLiteral("secp224r1"), @@ -139,6 +140,9 @@ tst_QSslKey::tst_QSslKey() unsupportedCurves.push_back(requestedEc); } } +#else + unsupportedCurves = {}; // not unsued anymore. +#endif } bool tst_QSslKey::fileContainsUnsupportedEllipticCurve(const QString &fileName) const |