Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2010-12-11 12:43:08 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2010-12-11 12:43:35 (GMT) |
| commit | aaf38fe2e6804bd87ea5e99a05ed57070cbe1c57 (patch) | |
| tree | 358ff7b5022e0c192e22f746e285f673bf5def9b /Swiften/Session | |
| parent | d9ce3491e818d96f3dc0154e9e5d30228420483c (diff) | |
| download | swift-contrib-aaf38fe2e6804bd87ea5e99a05ed57070cbe1c57.zip swift-contrib-aaf38fe2e6804bd87ea5e99a05ed57070cbe1c57.tar.bz2 | |
Added SCRAM-SHA-1-PLUS support.
Release-Notes: Swift now supports SCRAM-SHA-1-PLUS authentication.
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 | 2 |
3 files changed, 7 insertions, 0 deletions
diff --git a/Swiften/Session/BasicSessionStream.cpp b/Swiften/Session/BasicSessionStream.cpp index 32424bc..45489cf 100644 --- a/Swiften/Session/BasicSessionStream.cpp +++ b/Swiften/Session/BasicSessionStream.cpp @@ -15,6 +15,7 @@ #include "Swiften/StreamStack/CompressionLayer.h" #include "Swiften/StreamStack/TLSLayer.h" #include "Swiften/TLS/TLSContextFactory.h" +#include "Swiften/TLS/TLSContext.h" namespace Swift { @@ -93,6 +94,9 @@ boost::shared_ptr<CertificateVerificationError> BasicSessionStream::getPeerCerti return tlsLayer->getPeerCertificateVerificationError(); } +ByteArray BasicSessionStream::getTLSFinishMessage() const { + return tlsLayer->getContext()->getFinishMessage(); +} void BasicSessionStream::addZLibCompression() { boost::shared_ptr<CompressionLayer> compressionLayer(new CompressionLayer()); diff --git a/Swiften/Session/BasicSessionStream.h b/Swiften/Session/BasicSessionStream.h index fbaa937..6927800 100644 --- a/Swiften/Session/BasicSessionStream.h +++ b/Swiften/Session/BasicSessionStream.h @@ -54,6 +54,7 @@ namespace Swift { virtual bool isTLSEncrypted(); virtual Certificate::ref getPeerCertificate() const; virtual boost::shared_ptr<CertificateVerificationError> getPeerCertificateVerificationError() const; + virtual ByteArray getTLSFinishMessage() const; virtual void setWhitespacePingEnabled(bool); diff --git a/Swiften/Session/SessionStream.h b/Swiften/Session/SessionStream.h index d648f91..d3d3ebb 100644 --- a/Swiften/Session/SessionStream.h +++ b/Swiften/Session/SessionStream.h @@ -63,6 +63,8 @@ namespace Swift { virtual Certificate::ref getPeerCertificate() const = 0; virtual boost::shared_ptr<CertificateVerificationError> getPeerCertificateVerificationError() const = 0; + virtual ByteArray getTLSFinishMessage() const = 0; + boost::signal<void (const ProtocolHeader&)> onStreamStartReceived; boost::signal<void (boost::shared_ptr<Element>)> onElementReceived; boost::signal<void (boost::shared_ptr<Error>)> onError; |