diff options
Diffstat (limited to 'Swiften/TLS/PlatformTLSFactories.cpp')
-rw-r--r-- | Swiften/TLS/PlatformTLSFactories.cpp | 39 |
1 files changed, 19 insertions, 20 deletions
diff --git a/Swiften/TLS/PlatformTLSFactories.cpp b/Swiften/TLS/PlatformTLSFactories.cpp index 588e0e1..81f560b 100644 --- a/Swiften/TLS/PlatformTLSFactories.cpp +++ b/Swiften/TLS/PlatformTLSFactories.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2015 Isode Limited. + * Copyright (c) 2010-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ @@ -9,48 +9,47 @@ #include <Swiften/Base/Platform.h> #include <Swiften/TLS/CertificateFactory.h> #include <Swiften/TLS/TLSContextFactory.h> - #ifdef HAVE_OPENSSL - #include <Swiften/TLS/OpenSSL/OpenSSLContextFactory.h> - #include <Swiften/TLS/OpenSSL/OpenSSLCertificateFactory.h> + #include <Swiften/TLS/OpenSSL/OpenSSLContextFactory.h> + #include <Swiften/TLS/OpenSSL/OpenSSLCertificateFactory.h> #endif #ifdef HAVE_SCHANNEL - #include <Swiften/TLS/Schannel/SchannelContextFactory.h> - #include <Swiften/TLS/Schannel/SchannelCertificateFactory.h> + #include <Swiften/TLS/Schannel/SchannelContextFactory.h> + #include <Swiften/TLS/Schannel/SchannelCertificateFactory.h> #endif #ifdef HAVE_SECURETRANSPORT - #include <Swiften/TLS/SecureTransport/SecureTransportContextFactory.h> - #include <Swiften/TLS/SecureTransport/SecureTransportCertificateFactory.h> + #include <Swiften/TLS/SecureTransport/SecureTransportContextFactory.h> + #include <Swiften/TLS/SecureTransport/SecureTransportCertificateFactory.h> #endif namespace Swift { -PlatformTLSFactories::PlatformTLSFactories() : contextFactory(NULL), certificateFactory(NULL) { +PlatformTLSFactories::PlatformTLSFactories() : contextFactory(nullptr), certificateFactory(nullptr) { #ifdef HAVE_OPENSSL - contextFactory = new OpenSSLContextFactory(); - certificateFactory = new OpenSSLCertificateFactory(); + contextFactory = new OpenSSLContextFactory(); + certificateFactory = new OpenSSLCertificateFactory(); #endif #ifdef HAVE_SCHANNEL - contextFactory = new SchannelContextFactory(); - certificateFactory = new SchannelCertificateFactory(); + contextFactory = new SchannelContextFactory(); + certificateFactory = new SchannelCertificateFactory(); #endif #ifdef HAVE_SECURETRANSPORT - contextFactory = new SecureTransportContextFactory(); - certificateFactory = new SecureTransportCertificateFactory(); -#endif + contextFactory = new SecureTransportContextFactory(); + certificateFactory = new SecureTransportCertificateFactory(); +#endif } PlatformTLSFactories::~PlatformTLSFactories() { - delete contextFactory; - delete certificateFactory; + delete contextFactory; + delete certificateFactory; } TLSContextFactory* PlatformTLSFactories::getTLSContextFactory() const { - return contextFactory; + return contextFactory; } CertificateFactory* PlatformTLSFactories::getCertificateFactory() const { - return certificateFactory; + return certificateFactory; } } |