From 43d933bf5095170aef1f8223d333a13ea07c3031 Mon Sep 17 00:00:00 2001
From: Timur Pocheptsov <timur.pocheptsov@qt.io>
Date: Tue, 2 Feb 2021 14:55:00 +0100
Subject: Port QSslKey to the new plugin-based implementation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 src/network/ssl/qtlskey_schannel.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'src/network/ssl/qtlskey_schannel.cpp')

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();
-- 
cgit v1.2.3