diff options
| author | Mårten Nordheim <marten.nordheim@qt.io> | 2018-08-24 17:37:36 +0200 |
|---|---|---|
| committer | Mårten Nordheim <marten.nordheim@qt.io> | 2019-01-22 15:19:48 +0000 |
| commit | 7cc6f78dd448992c9a9cb31e001b908d44028516 (patch) | |
| tree | ee51817ef66c9263cbac7af86f9a04b12ea6a0d4 /src/network/ssl/qsslsocket_p.h | |
| parent | e0567d137df4ff3978f767fa723ae05a7b0ab546 (diff) | |
Schannel support
Adds support for Schannel, an SSL backend for Windows, as an
alternative to OpenSSL.
[ChangeLog][QtNetwork][Ssl] Added support for Schannel on Desktop
Windows. To build Qt with Schannel support use '-schannel' during
configure.
Task-number: QTBUG-62637
Change-Id: Ic4fb8ed3657dab994f9f4a4ac5cbddc7001a0a46
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Diffstat (limited to 'src/network/ssl/qsslsocket_p.h')
| -rw-r--r-- | src/network/ssl/qsslsocket_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/network/ssl/qsslsocket_p.h b/src/network/ssl/qsslsocket_p.h index 5115613695..3c37d5ad86 100644 --- a/src/network/ssl/qsslsocket_p.h +++ b/src/network/ssl/qsslsocket_p.h @@ -171,7 +171,7 @@ public: void _q_flushWriteBuffer(); void _q_flushReadBuffer(); void _q_resumeImplementation(); -#if defined(Q_OS_WIN) && !defined(Q_OS_WINRT) +#if defined(Q_OS_WIN) && !defined(Q_OS_WINRT) && !QT_CONFIG(schannel) virtual void _q_caRootLoaded(QSslCertificate,QSslCertificate) = 0; #endif @@ -209,7 +209,7 @@ protected: bool flushTriggered; }; -#if QT_CONFIG(securetransport) +#if QT_CONFIG(securetransport) || QT_CONFIG(schannel) // Implemented in qsslsocket_qt.cpp QByteArray _q_makePkcs12(const QList<QSslCertificate> &certs, const QSslKey &key, const QString &passPhrase); #endif |