diff options
| author | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2021-01-26 17:20:29 +0100 |
|---|---|---|
| committer | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2021-02-18 17:13:30 +0000 |
| commit | 64a878e36b178ddb3834c6ca782a6ebefed6aed8 (patch) | |
| tree | 71b972c44c9b309abc2892b2f53ea044ee9ebb33 /src/network/ssl/qsslsocket_mac.cpp | |
| parent | 0d4fb41e8c00263a0d385b70cc066776cbf6cc37 (diff) | |
Introduce QSsl::X509Certificate interface and its implementations
To enable QSslCertificate to use TLS plugins. All backend-specific
code is to be moved from QSslCertificate(Private) making them
backend-neutral.
Task-number: QTBUG-90954
Task-number: QTBUG-65922
Change-Id: Ic9d5abf91e42ce81fe56239f95ae97b64035e950
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
(cherry picked from commit 405337ee7276be4b76e86745c0694c51283b6b07)
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'src/network/ssl/qsslsocket_mac.cpp')
| -rw-r--r-- | src/network/ssl/qsslsocket_mac.cpp | 56 |
1 files changed, 3 insertions, 53 deletions
diff --git a/src/network/ssl/qsslsocket_mac.cpp b/src/network/ssl/qsslsocket_mac.cpp index c4d5b3ece7..3747456bf7 100644 --- a/src/network/ssl/qsslsocket_mac.cpp +++ b/src/network/ssl/qsslsocket_mac.cpp @@ -44,7 +44,7 @@ #include "qsslsocket_mac_p.h" #include "qasn1element_p.h" #include "qsslcertificate_p.h" -#include "qtlsbackend_p.h" +#include "qtlsbackend_st_p.h" #include "qsslcipher_p.h" #include "qtlskey_st_p.h" #include "qsslkey_p.h" @@ -75,59 +75,9 @@ QT_BEGIN_NAMESPACE -namespace -{ - -// These two classes are ad-hoc temporary solution, to be replaced -// by the real things soon. -class SecureTransportBackend : public QTlsBackend -{ -private: - QString backendName() const override - { - return builtinBackendNames[nameIndexSecureTransport]; - } - QSsl::TlsKey *createKey() const override - { - return new QSsl::TlsKeySecureTransport; - } - - QList<QSsl::SslProtocol> supportedProtocols() const override - { - QList<QSsl::SslProtocol> protocols; - - protocols << QSsl::AnyProtocol; - protocols << QSsl::SecureProtocols; - protocols << QSsl::TlsV1_0; - protocols << QSsl::TlsV1_0OrLater; - protocols << QSsl::TlsV1_1; - protocols << QSsl::TlsV1_1OrLater; - protocols << QSsl::TlsV1_2; - protocols << QSsl::TlsV1_2OrLater; - - return protocols; - } - - QList<QSsl::SupportedFeature> supportedFeatures() const override - { - QList<QSsl::SupportedFeature> features; - features << QSsl::SupportedFeature::ClientSideAlpn; - - return features; - } - - QList<QSsl::ImplementedClass> implementedClasses() const override - { - QList<QSsl::ImplementedClass> classes; - classes << QSsl::ImplementedClass::Socket; - classes << QSsl::ImplementedClass::Certificate; - classes << QSsl::ImplementedClass::Key; - - return classes; - } -}; +Q_GLOBAL_STATIC(QSecureTransportBackend, backend) -Q_GLOBAL_STATIC(SecureTransportBackend, backend) +namespace { #ifdef Q_OS_MACOS /* |