summaryrefslogtreecommitdiffstats
path: root/src/plugins/tls/certonly
diff options
context:
space:
mode:
authorTimur Pocheptsov <timur.pocheptsov@qt.io>2021-03-25 12:41:08 +0100
committerTimur Pocheptsov <timur.pocheptsov@qt.io>2021-04-22 22:51:54 +0200
commitd385158d5213ef568b7629e2aa4a818016bbffac (patch)
tree2c111b462fe39dffacb3c7f5cdd8db269f87ed6c /src/plugins/tls/certonly
parent6b1a7341fed4b9456ea6bfa2de7412d45ef56c65 (diff)
Move plugin code from QtNetwork to qtbase/plugins
All TLS (and non-TLS) backends that QSsl classes rely on are now in plugins/tls (as openssl, securetransport, schannel and certonly plugins). For now, I have to disable some tests that were using OpenSSL calls - this to be refactored/re-thought. These include: qsslsocket auto-test (test-case where we work with private keys), qsslkey auto-test (similar to qsslsocket - test-case working with keys using OpenSSL calls). qasn1element moved to plugins too, so its auto-test have to be re-thought. Since now we can have more than one working TLS-backend on a given platform, the presence of OpenSSL also means I force this backend as active before running tests, to make sure features implemented only in OpenSSL-backend are tested. OCSP auto test is disabled for now, since it heavily relies on OpenSSL symbols (to be refactored). [ChangeLog][QtNetwork][QSslSocket] QSslSocket by default prefers 'openssl' backend if it is available. [ChangeLog][QtNetwork][QSslSocket] TLS-backends are not mutually exclusive anymore, depending on a platform, more than one TLS backend can be built. E.g., configuring Qt with -openssl does not prevent SecureTransport or Schannel plugin from being built. Fixes: QTBUG-91928 Change-Id: I4c05e32f10179066bee3a518bdfdd6c4b15320c3 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'src/plugins/tls/certonly')
-rw-r--r--src/plugins/tls/certonly/CMakeLists.txt16
-rw-r--r--src/plugins/tls/certonly/qtlsbackend_cert.cpp92
-rw-r--r--src/plugins/tls/certonly/qtlsbackend_cert_p.h81
3 files changed, 189 insertions, 0 deletions
diff --git a/src/plugins/tls/certonly/CMakeLists.txt b/src/plugins/tls/certonly/CMakeLists.txt
new file mode 100644
index 0000000000..8a1a5c0691
--- /dev/null
+++ b/src/plugins/tls/certonly/CMakeLists.txt
@@ -0,0 +1,16 @@
+qt_internal_add_plugin(QTlsBackendCertOnly
+ OUTPUT_NAME certonlybackend
+ CLASS_NAME QTlsBackendCertOnly
+ TYPE tls
+ SOURCES
+ ../shared/qx509_base_p.h
+ ../shared/qx509_base.cpp
+ ../shared/qx509_generic_p.h
+ ../shared/qx509_generic.cpp
+ ../shared/qasn1element_p.h
+ ../shared/qasn1element.cpp
+ qtlsbackend_cert.cpp
+ qtlsbackend_cert_p.h
+ PUBLIC_LIBRARIES
+ Qt::NetworkPrivate
+)
diff --git a/src/plugins/tls/certonly/qtlsbackend_cert.cpp b/src/plugins/tls/certonly/qtlsbackend_cert.cpp
new file mode 100644
index 0000000000..c81eb0252e
--- /dev/null
+++ b/src/plugins/tls/certonly/qtlsbackend_cert.cpp
@@ -0,0 +1,92 @@
+/****************************************************************************
+**
+** Copyright (C) 2021 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 "qtlsbackend_cert_p.h"
+
+#include "../shared/qx509_generic_p.h"
+
+#include <qssl.h>
+
+#include <qlist.h>
+
+QT_BEGIN_NAMESPACE
+
+Q_LOGGING_CATEGORY(lcTlsBackend, "qt.tlsbackend.cert-only");
+
+QString QTlsBackendCertOnly::backendName() const
+{
+ return builtinBackendNames[nameIndexCertOnly];
+}
+
+
+QList<QSsl::SslProtocol> QTlsBackendCertOnly::supportedProtocols() const
+{
+ return {};
+}
+
+QList<QSsl::SupportedFeature> QTlsBackendCertOnly::supportedFeatures() const
+{
+ return {};
+}
+
+QList<QSsl::ImplementedClass> QTlsBackendCertOnly::implementedClasses() const
+{
+ QList<QSsl::ImplementedClass> classes;
+ classes << QSsl::ImplementedClass::Certificate;
+
+ return classes;
+}
+
+QTlsPrivate::X509Certificate *QTlsBackendCertOnly::createCertificate() const
+{
+ return new QTlsPrivate::X509CertificateGeneric;
+}
+
+QTlsPrivate::X509PemReaderPtr QTlsBackendCertOnly::X509PemReader() const
+{
+ return QTlsPrivate::X509CertificateGeneric::certificatesFromPem;
+}
+
+QTlsPrivate::X509DerReaderPtr QTlsBackendCertOnly::X509DerReader() const
+{
+ return QTlsPrivate::X509CertificateGeneric::certificatesFromDer;
+}
+
+QT_END_NAMESPACE
+
diff --git a/src/plugins/tls/certonly/qtlsbackend_cert_p.h b/src/plugins/tls/certonly/qtlsbackend_cert_p.h
new file mode 100644
index 0000000000..ddbe02e5a9
--- /dev/null
+++ b/src/plugins/tls/certonly/qtlsbackend_cert_p.h
@@ -0,0 +1,81 @@
+/****************************************************************************
+**
+** Copyright (C) 2021 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 QTLSBACKEND_CERT_P_H
+#define QTLSBACKEND_CERT_P_H
+
+//
+// W A R N I N G
+// -------------
+//
+// This file is not part of the Qt API. It exists purely as an
+// implementation detail. 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 <QtNetwork/private/qtlsbackend_p.h>
+
+#include <QtCore/qglobal.h>
+
+QT_BEGIN_NAMESPACE
+
+class QTlsBackendCertOnly final : public QTlsBackend
+{
+ Q_OBJECT
+ Q_PLUGIN_METADATA(IID QTlsBackend_iid)
+ Q_INTERFACES(QTlsBackend)
+private:
+ QString backendName() const override;
+
+ QList<QSsl::SslProtocol> supportedProtocols() const override;
+ QList<QSsl::SupportedFeature> supportedFeatures() const override;
+ QList<QSsl::ImplementedClass> implementedClasses() const override;
+
+ QTlsPrivate::X509Certificate *createCertificate() const override;
+ QTlsPrivate::X509PemReaderPtr X509PemReader() const override;
+ QTlsPrivate::X509DerReaderPtr X509DerReader() const override;
+};
+
+QT_END_NAMESPACE
+
+#endif // QTLSBACKEND_CERT_P_H