Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2009-11-27 19:06:47 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2009-11-27 19:06:47 (GMT) |
| commit | aa09a889108c4d0e3c5888ad98958d8f3e12bd3b (patch) | |
| tree | 3c621ae0a6e2150281be182b37e2837b804adcba /Swiften/StringCodecs/SHA1.cpp | |
| parent | c89ef0ffae597ac8c1063732e1d9a2d84703a80c (diff) | |
| download | swift-aa09a889108c4d0e3c5888ad98958d8f3e12bd3b.zip swift-aa09a889108c4d0e3c5888ad98958d8f3e12bd3b.tar.bz2 | |
Added MD5 hashing algorithm.
Moved 'hexifying' of hashes into its own class, such that it can be
shared between all hashes.
Diffstat (limited to 'Swiften/StringCodecs/SHA1.cpp')
| -rw-r--r-- | Swiften/StringCodecs/SHA1.cpp | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/Swiften/StringCodecs/SHA1.cpp b/Swiften/StringCodecs/SHA1.cpp index 70256e9..ef99d9a 100644 --- a/Swiften/StringCodecs/SHA1.cpp +++ b/Swiften/StringCodecs/SHA1.cpp @@ -1,10 +1,6 @@ -#include <sstream> -#include <iomanip> -#include <boost/numeric/conversion/cast.hpp> - #include "Swiften/Base/Platform.h" #pragma GCC diagnostic ignored "-Wold-style-cast" /* SHA-1 in C @@ -184,29 +180,18 @@ boost::uint8_t finalcount[8]; // ----------------------------------------------------------------------------- #include "Swiften/StringCodecs/SHA1.h" namespace Swift { -ByteArray SHA1::getBinaryHash(const ByteArray& input) { +ByteArray SHA1::getHash(const ByteArray& input) { ByteArray inputCopy(input); ByteArray digest; digest.resize(20); SHA1_CTX context; SHA1Init(&context); SHA1Update(&context, (boost::uint8_t*) inputCopy.getData(), inputCopy.getSize()); SHA1Final((boost::uint8_t*) digest.getData(), &context); return digest; } -String SHA1::getHexHash(const ByteArray& input) { - ByteArray digest = getBinaryHash(input); - std::ostringstream result; - result << std::hex; - - for (unsigned int i = 0; i < digest.getSize(); ++i) { - result << std::setw(2) << std::setfill('0') << boost::numeric_cast<unsigned int>(static_cast<unsigned char>(digest[i])); - } - return String(result.str()); -} - } |