Remove superfluous files copied from QtNetwork

Change-Id: I298c88ea110d05d12192277e0686f6539cd26a90
Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>

6 files changed, 7 insertions, 379 deletions

diff --git a/src/knx/ssl/qssl.cpp b/src/knx/ssl/qssl.cpp
deleted file mode 100644
index 7cfa6c3..0000000
--- a/src/knx/ssl/qssl.cpp
+++ /dev/null
@@ -1,191 +0,0 @@
-/****************************************************************************
-**
-** 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$
-**
-****************************************************************************/
-
-#include "qssl_p.h"
-
-QT_BEGIN_NAMESPACE
-
-Q_LOGGING_CATEGORY(lcSsl, "qt.network.ssl");
-
-/*! \namespace QSsl
-
-    \brief The QSsl namespace declares enums common to all SSL classes in Qt Network.
-    \since 4.3
-
-    \ingroup network
-    \ingroup ssl
-    \inmodule QtNetwork
-*/
-
-/*!
-    \enum QSsl::KeyType
-
-    Describes the two types of keys QSslKey supports.
-
-    \value PrivateKey A private key.
-    \value PublicKey A public key.
-*/
-
-/*!
-    \enum QSsl::KeyAlgorithm
-
-    Describes the different key algorithms supported by QSslKey.
-
-    \value Rsa The RSA algorithm.
-    \value Dsa The DSA algorithm.
-    \value Ec  The Elliptic Curve algorithm
-    \value Opaque A key that should be treated as a 'black box' by QSslKey.
-
-    The opaque key facility allows applications to add support for facilities
-    such as PKCS#11 that Qt does not currently offer natively.
-*/
-
-/*!
-    \enum QSsl::EncodingFormat
-
-    Describes supported encoding formats for certificates and keys.
-
-    \value Pem The PEM format.
-    \value Der The DER format.
-*/
-
-/*!
-    \enum QSsl::AlternativeNameEntryType
-
-    Describes the key types for alternative name entries in QSslCertificate.
-
-    \value EmailEntry An email entry; the entry contains an email address that
-    the certificate is valid for.
-
-    \value DnsEntry A DNS host name entry; the entry contains a host name
-    entry that the certificate is valid for. The entry may contain wildcards.
-
-    \note In Qt 4, this enum was called \c {AlternateNameEntryType}. That name
-    is deprecated in Qt 5.
-
-    \sa QSslCertificate::subjectAlternativeNames()
-*/
-
-/*!
-  \typedef QSsl::AlternateNameEntryType
-  \obsolete
-
-  Use QSsl::AlternativeNameEntryType instead.
-*/
-
-/*!
-    \enum QSsl::SslProtocol
-
-    Describes the protocol of the cipher.
-
-    \value SslV3 SSLv3. When using the WinRT backend this option will also enable TLSv1.0
-    \value SslV2 SSLv2. Note, SSLv2 support was removed in OpenSSL 1.1.
-    \value TlsV1_0 TLSv1.0
-    \value TlsV1_0OrLater TLSv1.0 and later versions. This option is not available when using the WinRT backend due to platform limitations.
-    \value TlsV1 Obsolete, means the same as TlsV1_0
-    \value TlsV1_1 TLSv1.1. When using the WinRT backend this option will also enable TLSv1.0.
-    \value TlsV1_1OrLater TLSv1.1 and later versions. This option is not available when using the WinRT backend due to platform limitations.
-    \value TlsV1_2 TLSv1.2. When using the WinRT backend this option will also enable TLSv1.0 and TLSv1.1.
-    \value TlsV1_2OrLater TLSv1.2 and later versions. This option is not available when using the WinRT backend due to platform limitations.
-    \value UnknownProtocol The cipher's protocol cannot be determined.
-    \value AnyProtocol The socket understands SSLv2, SSLv3, TLSv1.0 and all
-    supported later versions of TLS. This value is used by QSslSocket only.
-    \value TlsV1SslV3 On the client side, this will send
-    a TLS 1.0 Client Hello, enabling TLSv1_0 and SSLv3 connections.
-    On the server side, this will enable both SSLv3 and TLSv1_0 connections.
-    \value SecureProtocols The default option, using protocols known to be secure;
-    currently behaves similar to TlsV1Ssl3 except denying SSLv3 connections that does
-    not upgrade to TLS.
-
-    \note most servers understand both SSL and TLS, but it is recommended to use
-    TLS only for security reasons. However, SSL and TLS are not compatible with
-    each other: if you get unexpected handshake failures, verify that you chose
-    the correct setting for your protocol.
-*/
-
-/*!
-    \enum QSsl::SslOption
-
-    Describes the options that can be used to control the details of
-    SSL behaviour. These options are generally used to turn features off
-    to work around buggy servers.
-
-    \value SslOptionDisableEmptyFragments Disables the insertion of empty
-    fragments into the data when using block ciphers. When enabled, this
-    prevents some attacks (such as the BEAST attack), however it is
-    incompatible with some servers.
-    \value SslOptionDisableSessionTickets Disables the SSL session ticket
-    extension. This can cause slower connection setup, however some servers
-    are not compatible with the extension.
-    \value SslOptionDisableCompression Disables the SSL compression
-    extension. When enabled, this allows the data being passed over SSL to
-    be compressed, however some servers are not compatible with this
-    extension.
-    \value SslOptionDisableServerNameIndication Disables the SSL server
-    name indication extension. When enabled, this tells the server the virtual
-    host being accessed allowing it to respond with the correct certificate.
-    \value SslOptionDisableLegacyRenegotiation Disables the older insecure
-    mechanism for renegotiating the connection parameters. When enabled, this
-    option can allow connections for legacy servers, but it introduces the
-    possibility that an attacker could inject plaintext into the SSL session.
-    \value SslOptionDisableSessionSharing Disables SSL session sharing via
-    the session ID handshake attribute.
-    \value SslOptionDisableSessionPersistence Disables storing the SSL session
-    in ASN.1 format as returned by QSslConfiguration::sessionTicket(). Enabling
-    this feature adds memory overhead of approximately 1K per used session
-    ticket.
-    \value SslOptionDisableServerCipherPreference Disables selecting the cipher
-    chosen based on the servers preferences rather than the order ciphers were
-    sent by the client. This option is only relevant to server sockets, and is
-    only honored by the OpenSSL backend.
-
-    By default, SslOptionDisableEmptyFragments is turned on since this causes
-    problems with a large number of servers. SslOptionDisableLegacyRenegotiation
-    is also turned on, since it introduces a security risk.
-    SslOptionDisableCompression is turned on to prevent the attack publicised by
-    CRIME.
-    SslOptionDisableSessionPersistence is turned on to optimize memory usage.
-    The other options are turned off.
-
-    \note Availability of above options depends on the version of the SSL
-    backend in use.
-*/
-
-
-QT_END_NAMESPACE
diff --git a/src/knx/ssl/qssl.h b/src/knx/ssl/qssl.h
deleted file mode 100644
index c2a468c..0000000
--- a/src/knx/ssl/qssl.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/****************************************************************************
-**
-** 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$
-**
-****************************************************************************/
-
-
-#ifndef QSSL_H
-#define QSSL_H
-
-#include <QtNetwork/qtnetworkglobal.h>
-#include <QtCore/QFlags>
-
-QT_BEGIN_NAMESPACE
-
-
-namespace QSsl {
-    enum KeyType {
-        PrivateKey,
-        PublicKey
-    };
-
-    enum EncodingFormat {
-        Pem,
-        Der
-    };
-
-    enum KeyAlgorithm {
-        Opaque,
-        Rsa,
-        Dsa,
-        Ec
-    };
-
-    enum AlternativeNameEntryType {
-        EmailEntry,
-        DnsEntry
-    };
-
-#if QT_DEPRECATED_SINCE(5,0)
-    typedef AlternativeNameEntryType AlternateNameEntryType;
-#endif
-
-    enum SslProtocol {
-        SslV3,
-        SslV2,
-        TlsV1_0,
-#if QT_DEPRECATED_SINCE(5,0)
-        TlsV1 = TlsV1_0,
-#endif
-        TlsV1_1,
-        TlsV1_2,
-        AnyProtocol,
-        TlsV1SslV3,
-        SecureProtocols,
-
-        TlsV1_0OrLater,
-        TlsV1_1OrLater,
-        TlsV1_2OrLater,
-
-        UnknownProtocol = -1
-    };
-
-    enum SslOption {
-        SslOptionDisableEmptyFragments = 0x01,
-        SslOptionDisableSessionTickets = 0x02,
-        SslOptionDisableCompression = 0x04,
-        SslOptionDisableServerNameIndication = 0x08,
-        SslOptionDisableLegacyRenegotiation = 0x10,
-        SslOptionDisableSessionSharing = 0x20,
-        SslOptionDisableSessionPersistence = 0x40,
-        SslOptionDisableServerCipherPreference = 0x80
-    };
-    Q_DECLARE_FLAGS(SslOptions, SslOption)
-}
-
-Q_DECLARE_OPERATORS_FOR_FLAGS(QSsl::SslOptions)
-
-QT_END_NAMESPACE
-
-#endif // QSSL_H
diff --git a/src/knx/ssl/qssl_p.h b/src/knx/ssl/qssl_p.h
deleted file mode 100644
index 83ccdc7..0000000
--- a/src/knx/ssl/qssl_p.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/****************************************************************************
-**
-** 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$
-**
-****************************************************************************/
-
-
-#ifndef QSSL_P_H
-#define QSSL_P_H
-
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists for the convenience
-// of qsslcertificate.cpp.  This header file may change from version to version
-// without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QtNetwork/private/qtnetworkglobal_p.h>
-#include <QtCore/QLoggingCategory>
-
-QT_BEGIN_NAMESPACE
-
-Q_DECLARE_LOGGING_CATEGORY(lcSsl)
-
-QT_END_NAMESPACE
-
-#endif // QSSL_P_H
diff --git a/src/knx/ssl/qsslsocket_openssl_symbols.cpp b/src/knx/ssl/qsslsocket_openssl_symbols.cpp
index 23bcb9d..c89cafb 100644
--- a/src/knx/ssl/qsslsocket_openssl_symbols.cpp
+++ b/src/knx/ssl/qsslsocket_openssl_symbols.cpp
@@ -54,7 +54,6 @@
 **
 ****************************************************************************/
 
-#include "qssl_p.h"
 #include "qsslsocket_openssl_symbols_p.h"
 
 #ifdef Q_OS_WIN
@@ -118,6 +117,8 @@ QT_BEGIN_NAMESPACE
     possibly with a different version of OpenSSL.
 */
 
+Q_LOGGING_CATEGORY(lcSsl, "qt.network.ssl");
+
 #ifndef QT_LINKED_OPENSSL
 
 namespace {
diff --git a/src/knx/ssl/qsslsocket_openssl_symbols_p.h b/src/knx/ssl/qsslsocket_openssl_symbols_p.h
index 5bbbff8..cf7cac3 100644
--- a/src/knx/ssl/qsslsocket_openssl_symbols_p.h
+++ b/src/knx/ssl/qsslsocket_openssl_symbols_p.h
@@ -103,10 +103,13 @@
 #include <openssl/dh.h>
 #endif
 
+#include <QtCore/qloggingcategory.h>
 #include <QtCore/qglobal.h>
 
 QT_BEGIN_NAMESPACE
 
+Q_DECLARE_LOGGING_CATEGORY(lcSsl)
+
 #define DUMMYARG
 
 #if !defined QT_LINKED_OPENSSL
diff --git a/src/knx/ssl/ssl.pri b/src/knx/ssl/ssl.pri
index 9c5ea18..a4318a1 100644
--- a/src/knx/ssl/ssl.pri
+++ b/src/knx/ssl/ssl.pri
@@ -8,15 +8,9 @@ SOURCES += ssl/qknxcryptographicengine.cpp \
            ssl/qknxsecureconfiguration.cpp
 
 qtConfig(opensslv11) { # OpenSSL 1.1 support is required.
-    HEADERS += ssl/qssl.h \
-               ssl/qssl_p.h
-
-    SOURCES += ssl/qssl.cpp
-
-    HEADERS += ssl/qsslsocket_openssl_symbols_p.h
     SOURCES += ssl/qsslsocket_openssl_symbols.cpp
-
-    HEADERS += ssl/qsslsocket_openssl11_symbols_p.h
+    HEADERS += ssl/qsslsocket_openssl_symbols_p.h \
+               ssl/qsslsocket_openssl11_symbols_p.h
 
     QMAKE_CXXFLAGS += -DOPENSSL_API_COMPAT=0x10100000L