Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2010-05-08 17:01:12 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2010-05-08 17:01:12 (GMT) |
| commit | eb6a3e659254de70b7c45627e7e0f4f53b737d04 (patch) | |
| tree | 09152371318a66feb4e8b0c936255bab17b74a91 /Swiften/Session | |
| parent | d233ec7a863fb0b9a6f20ea0aa52c7c0ea38e2fd (diff) | |
| download | swift-eb6a3e659254de70b7c45627e7e0f4f53b737d04.zip swift-eb6a3e659254de70b7c45627e7e0f4f53b737d04.tar.bz2 | |
Don't allow PLAIN over Non-TLS.
Diffstat (limited to 'Swiften/Session')
| -rw-r--r-- | Swiften/Session/BasicSessionStream.cpp | 4 | ||||
| -rw-r--r-- | Swiften/Session/BasicSessionStream.h | 1 | ||||
| -rw-r--r-- | Swiften/Session/SessionStream.h | 1 |
3 files changed, 6 insertions, 0 deletions
diff --git a/Swiften/Session/BasicSessionStream.cpp b/Swiften/Session/BasicSessionStream.cpp index 861b9d0..d75e2c3 100644 --- a/Swiften/Session/BasicSessionStream.cpp +++ b/Swiften/Session/BasicSessionStream.cpp @@ -81,6 +81,10 @@ void BasicSessionStream::addTLSEncryption() { } } +bool BasicSessionStream::isTLSEncrypted() { + return tlsLayer; +} + void BasicSessionStream::addZLibCompression() { boost::shared_ptr<CompressionLayer> compressionLayer(new CompressionLayer()); streamStack->addLayer(compressionLayer); diff --git a/Swiften/Session/BasicSessionStream.h b/Swiften/Session/BasicSessionStream.h index 7c98992..7f194ff 100644 --- a/Swiften/Session/BasicSessionStream.h +++ b/Swiften/Session/BasicSessionStream.h @@ -49,6 +49,7 @@ namespace Swift { virtual bool supportsTLSEncryption(); virtual void addTLSEncryption(); + virtual bool isTLSEncrypted(); virtual void setWhitespacePingEnabled(bool); diff --git a/Swiften/Session/SessionStream.h b/Swiften/Session/SessionStream.h index 614d237..f2d4a7b 100644 --- a/Swiften/Session/SessionStream.h +++ b/Swiften/Session/SessionStream.h @@ -44,6 +44,7 @@ namespace Swift { virtual bool supportsTLSEncryption() = 0; virtual void addTLSEncryption() = 0; + virtual bool isTLSEncrypted() = 0; virtual void setWhitespacePingEnabled(bool enabled) = 0; virtual void resetXMPPParser() = 0; |