diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-06-29 11:33:36 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-07-06 06:52:06 +0000 |
| commit | a149659c5c028d4049c60c4f9a30b481a79cfe08 (patch) | |
| tree | ef9147ef0de9a6cc4bb7f9683726ebd7c3473c0b /src/network/ssl/qsslcertificate.h | |
| parent | 514972544a34aca0fd679b3a78521a0a1558d4e0 (diff) | |
Provide access to QSslCertificate on OpenSSL free Windows builds
The QSslCertificate class can parse and provide details about SSL
certificates without a proper backend, this can for instance be used
by QtWebEngine to provide metadata about certificates, even on Windows
builds without OpenSSL, as QtWebEngine does not use Qt's SSL stack.
Change-Id: Ib48f1ed7315c5bc66721ec87ee651d8372f07f71
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'src/network/ssl/qsslcertificate.h')
| -rw-r--r-- | src/network/ssl/qsslcertificate.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/network/ssl/qsslcertificate.h b/src/network/ssl/qsslcertificate.h index 6cd66fd20f..553fb8884d 100644 --- a/src/network/ssl/qsslcertificate.h +++ b/src/network/ssl/qsslcertificate.h @@ -55,8 +55,6 @@ #include <QtCore/qmap.h> #include <QtNetwork/qssl.h> -#ifndef QT_NO_SSL - QT_BEGIN_NAMESPACE class QDateTime; @@ -131,7 +129,9 @@ public: QMultiMap<QSsl::AlternativeNameEntryType, QString> subjectAlternativeNames() const; QDateTime effectiveDate() const; QDateTime expiryDate() const; +#ifndef QT_NO_SSL QSslKey publicKey() const; +#endif QList<QSslCertificateExtension> extensions() const; QByteArray toPem() const; @@ -146,6 +146,7 @@ public: static QList<QSslCertificate> fromData( const QByteArray &data, QSsl::EncodingFormat format = QSsl::Pem); +#ifndef QT_NO_SSL #if QT_VERSION >= QT_VERSION_CHECK(6,0,0) static QList<QSslError> verify(const QList<QSslCertificate> &certificateChain, const QString &hostName = QString()); #else @@ -156,6 +157,7 @@ public: QSslKey *key, QSslCertificate *cert, QList<QSslCertificate> *caCertificates = nullptr, const QByteArray &passPhrase=QByteArray()); +#endif Qt::HANDLE handle() const; @@ -178,6 +180,4 @@ QT_END_NAMESPACE Q_DECLARE_METATYPE(QSslCertificate) -#endif // QT_NO_SSL - #endif |