Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2014-12-17 15:21:30 (GMT) |
|---|---|---|
| committer | Swift Review <review@swift.im> | 2015-02-03 10:03:17 (GMT) |
| commit | b5fc240f1cf4e340e04177a23cb8cf827b9ca16b (patch) | |
| tree | 13d701e160af328553551974e55fea876d21eed8 /Swiften/FileTransfer/IncrementalBytestreamHashCalculator.h | |
| parent | d860805af76ec85e003bf3019407bbb7acd218c9 (diff) | |
| download | swift-b5fc240f1cf4e340e04177a23cb8cf827b9ca16b.zip swift-b5fc240f1cf4e340e04177a23cb8cf827b9ca16b.tar.bz2 | |
Update Jingle FT protocol to namespace verison urn:xmpp:jingle:apps:file-transfer:4.
Test-Information:
Adjusted unit tests and successfully build/run them on OS X 10.9.5.
Change-Id: I63789e3fb351999f719157b54fa9fcf95f40fb07
Diffstat (limited to 'Swiften/FileTransfer/IncrementalBytestreamHashCalculator.h')
| -rw-r--r-- | Swiften/FileTransfer/IncrementalBytestreamHashCalculator.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Swiften/FileTransfer/IncrementalBytestreamHashCalculator.h b/Swiften/FileTransfer/IncrementalBytestreamHashCalculator.h index bb6b441..bc4ebf9 100644 --- a/Swiften/FileTransfer/IncrementalBytestreamHashCalculator.h +++ b/Swiften/FileTransfer/IncrementalBytestreamHashCalculator.h @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2013 Isode Limited. + * Copyright (c) 2013-2014 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ @@ -30,14 +30,17 @@ namespace Swift { void feedData(const ByteArray& data); //void feedData(const SafeByteArray& data); + ByteArray getSHA1Hash(); + ByteArray getMD5Hash(); + std::string getSHA1String(); std::string getMD5String(); private: Hash* md5Hasher; Hash* sha1Hasher; - boost::optional<std::string> md5Hash; - boost::optional<std::string> sha1Hash; + boost::optional<ByteArray> md5Hash; + boost::optional<ByteArray> sha1Hash; }; } |