1 files changed, 15 insertions, 104 deletions
diff --git a/src/network/ssl/qsslkey_p.h b/src/network/ssl/qsslkey_p.h
index dd1a31b0e5..d28ee5ad11 100644
--- a/src/network/ssl/qsslkey_p.h
+++ b/src/network/ssl/qsslkey_p.h
@@ -1,41 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtNetwork module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 
 #ifndef QSSLKEY_OPENSSL_P_H
@@ -53,83 +17,30 @@
 //
 
 #include <QtNetwork/private/qtnetworkglobal_p.h>
+
 #include "qsslkey.h"
-#include "qsslsocket_p.h" // includes wincrypt.h
+#include "qssl_p.h"
 
-#ifndef QT_NO_OPENSSL
-#include <openssl/rsa.h>
-#include <openssl/dsa.h>
-#endif
+#include <memory>
 
 QT_BEGIN_NAMESPACE
 
+namespace QTlsPrivate {
+class TlsKey;
+}
+
 class QSslKeyPrivate
 {
 public:
-    inline QSslKeyPrivate()
-        : algorithm(QSsl::Opaque)
-        , opaque(nullptr)
-    {
-        clear(false);
-    }
-
-    inline ~QSslKeyPrivate()
-    { clear(); }
-
-    void clear(bool deep = true);
-
-#ifndef QT_NO_OPENSSL
-    bool fromEVP_PKEY(EVP_PKEY *pkey);
-#endif
-    void decodeDer(const QByteArray &der, const QByteArray &passPhrase = {}, bool deepClear = true);
-    void decodePem(const QByteArray &pem, const QByteArray &passPhrase, bool deepClear = true);
-    QByteArray pemHeader() const;
-    QByteArray pemFooter() const;
-    QByteArray pemFromDer(const QByteArray &der, const QMap<QByteArray, QByteArray> &headers) const;
-    QByteArray derFromPem(const QByteArray &pem, QMap<QByteArray, QByteArray> *headers) const;
-
-    int length() const;
-    QByteArray toPem(const QByteArray &passPhrase) const;
-    Qt::HANDLE handle() const;
-
-    bool isEncryptedPkcs8(const QByteArray &der) const;
-#if !QT_CONFIG(openssl)
-    QByteArray decryptPkcs8(const QByteArray &encrypted, const QByteArray &passPhrase);
-    bool isPkcs8 = false;
-#endif
-
-    bool isNull;
-    QSsl::KeyType type;
-    QSsl::KeyAlgorithm algorithm;
-
-    enum Cipher {
-        DesCbc,
-        DesEde3Cbc,
-        Rc2Cbc,
-        Aes128Cbc,
-        Aes192Cbc,
-        Aes256Cbc
-    };
+    QSslKeyPrivate();
+    ~QSslKeyPrivate();
 
-    Q_AUTOTEST_EXPORT static QByteArray decrypt(Cipher cipher, const QByteArray &data, const QByteArray &key, const QByteArray &iv);
-    Q_AUTOTEST_EXPORT static QByteArray encrypt(Cipher cipher, const QByteArray &data, const QByteArray &key, const QByteArray &iv);
+    using Cipher = QTlsPrivate::Cipher;
 
-#ifndef QT_NO_OPENSSL
-    union {
-        EVP_PKEY *opaque;
-        RSA *rsa;
-        DSA *dsa;
-        DH *dh;
-#ifndef OPENSSL_NO_EC
-        EC_KEY *ec;
-#endif
-    };
-#else
-    Qt::HANDLE opaque;
-    QByteArray derData;
-    int keyLength;
-#endif
+    Q_NETWORK_EXPORT static QByteArray decrypt(Cipher cipher, const QByteArray &data, const QByteArray &key, const QByteArray &iv);
+    Q_NETWORK_EXPORT static QByteArray encrypt(Cipher cipher, const QByteArray &data, const QByteArray &key, const QByteArray &iv);
 
+    std::unique_ptr<QTlsPrivate::TlsKey> backend;
     QAtomicInt ref;
 
 private: