diff options
author | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2021-02-02 14:55:00 +0100 |
---|---|---|
committer | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2021-02-19 11:57:05 +0100 |
commit | 43d933bf5095170aef1f8223d333a13ea07c3031 (patch) | |
tree | 425331de13b19166f784c8c5e27b3e45eb09bfe3 /src/network/ssl/qtlskey_schannel.cpp | |
parent | 9385e5407102240555ea1c18871f9adbff600afa (diff) |
Port QSslKey to the new plugin-based implementation
The idea is to have QSslKey(Private) backend-neutral and hide
all library-specific code inside plugins.
Fixes: QTBUG-90953
Task-number: QTBUG-65922
Change-Id: I2eeee3b2b72c78c2e24f2fb914abce3caa913be8
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io>
(cherry picked from commit 0352cf8e1bf57615b9faf3f6f383896444e762ac)
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Diffstat (limited to 'src/network/ssl/qtlskey_schannel.cpp')
-rw-r--r-- | src/network/ssl/qtlskey_schannel.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/network/ssl/qtlskey_schannel.cpp b/src/network/ssl/qtlskey_schannel.cpp index d53cfe61e9..39ffa94837 100644 --- a/src/network/ssl/qtlskey_schannel.cpp +++ b/src/network/ssl/qtlskey_schannel.cpp @@ -46,6 +46,7 @@ #include <QtCore/qscopeguard.h> #include <QtCore/qbytearray.h> +#include <QtCore/qt_windows.h> #include <wincrypt.h> QT_BEGIN_NAMESPACE @@ -54,15 +55,15 @@ namespace { const wchar_t *getName(QSslKeyPrivate::Cipher cipher) { switch (cipher) { - case QSslKeyPrivate::Cipher::DesCbc: + case QSsl::Cipher::DesCbc: return BCRYPT_DES_ALGORITHM; - case QSslKeyPrivate::Cipher::DesEde3Cbc: + case QSsl::Cipher::DesEde3Cbc: return BCRYPT_3DES_ALGORITHM; - case QSslKeyPrivate::Cipher::Rc2Cbc: + case QSsl::Cipher::Rc2Cbc: return BCRYPT_RC2_ALGORITHM; - case QSslKeyPrivate::Cipher::Aes128Cbc: - case QSslKeyPrivate::Cipher::Aes192Cbc: - case QSslKeyPrivate::Cipher::Aes256Cbc: + case QSsl::Cipher::Aes128Cbc: + case QSsl::Cipher::Aes192Cbc: + case QSsl::Cipher::Aes256Cbc: return BCRYPT_AES_ALGORITHM; } Q_UNREACHABLE(); |