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_qt.cpp | |
| 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_qt.cpp')
| -rw-r--r-- | src/network/ssl/qsslcertificate_qt.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/network/ssl/qsslcertificate_qt.cpp b/src/network/ssl/qsslcertificate_qt.cpp index 1cc2b1f964..4efc477dc3 100644 --- a/src/network/ssl/qsslcertificate_qt.cpp +++ b/src/network/ssl/qsslcertificate_qt.cpp @@ -41,8 +41,10 @@ #include "qsslcertificate_p.h" #include "qssl_p.h" +#ifndef QT_NO_SSL #include "qsslkey.h" #include "qsslkey_p.h" +#endif #include "qsslcertificateextension.h" #include "qsslcertificateextension_p.h" #include "qasn1element_p.h" @@ -145,6 +147,7 @@ Qt::HANDLE QSslCertificate::handle() const } #endif +#ifndef QT_NO_SSL QSslKey QSslCertificate::publicKey() const { QSslKey key; @@ -155,6 +158,7 @@ QSslKey QSslCertificate::publicKey() const } return key; } +#endif QList<QSslCertificateExtension> QSslCertificate::extensions() const { |