Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2015-11-18 14:08:45 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2015-11-18 14:08:45 (GMT) |
| commit | cda6fd478b3d8f7f30f771b18324db389a01b1b3 (patch) | |
| tree | 2d71e6787a0e937701968b5ce440f01c74c911ca /Swiften/StreamStack/TLSLayer.h | |
| parent | eb2cdc07f275d565b76940396381784e29125981 (diff) | |
| download | swift-cda6fd478b3d8f7f30f771b18324db389a01b1b3.zip swift-cda6fd478b3d8f7f30f771b18324db389a01b1b3.tar.bz2 | |
Fix virtual destructors and mismatching signal disconnection
Test-Information:
Unit tests pass on OS X 10.10.5.
Change-Id: I7b505513b4342001596ee8518bfdcf9e77c91479
Diffstat (limited to 'Swiften/StreamStack/TLSLayer.h')
| -rw-r--r-- | Swiften/StreamStack/TLSLayer.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Swiften/StreamStack/TLSLayer.h b/Swiften/StreamStack/TLSLayer.h index 87d69a9..0ab35d5 100644 --- a/Swiften/StreamStack/TLSLayer.h +++ b/Swiften/StreamStack/TLSLayer.h @@ -3,31 +3,30 @@ * All rights reserved. * See the COPYING file for more information. */ #pragma once -#include <Swiften/Base/boost_bsignals.h> - #include <Swiften/Base/API.h> #include <Swiften/Base/SafeByteArray.h> +#include <Swiften/Base/boost_bsignals.h> #include <Swiften/StreamStack/StreamLayer.h> #include <Swiften/TLS/Certificate.h> -#include <Swiften/TLS/CertificateWithKey.h> #include <Swiften/TLS/CertificateVerificationError.h> +#include <Swiften/TLS/CertificateWithKey.h> #include <Swiften/TLS/TLSError.h> #include <Swiften/TLS/TLSOptions.h> namespace Swift { class TLSContext; class TLSContextFactory; class SWIFTEN_API TLSLayer : public StreamLayer { public: TLSLayer(TLSContextFactory*, const TLSOptions&); - ~TLSLayer(); + virtual ~TLSLayer(); void connect(); bool setClientCertificate(CertificateWithKey::ref cert); Certificate::ref getPeerCertificate() const; std::vector<Certificate::ref> getPeerCertificateChain() const; |