diff options
Diffstat (limited to 'src/utils.h')
-rw-r--r-- | src/utils.h | 40 |
1 files changed, 25 insertions, 15 deletions
diff --git a/src/utils.h b/src/utils.h index 09dd0993..e09c603d 100644 --- a/src/utils.h +++ b/src/utils.h @@ -578,29 +578,39 @@ inline int peek_next_nonws(std::istream& in) { *_p = '\0'; \ } -inline string to_hex(unsigned char * message_digest, const int len = 4) -{ +inline string digest_to_hex( + const boost::uuids::detail::sha1::digest_type& message_digest, + size_t len = sizeof(boost::uuids::detail::sha1::digest_type) * 2 +) { std::ostringstream buf; - - for(int i = 0; i < 20 ; i++) { - buf.width(2); - buf.fill('0'); - buf << std::hex << (int)message_digest[i]; - if (i + 1 >= len) - break; // only output the first LEN dwords + buf.setf(std::ios_base::hex, std::ios_base::basefield); + buf.fill('0'); + + // sha1::digest_type is an array type and may change between Boost versions + const size_t count = std::min( + sizeof(message_digest) / sizeof(message_digest[0]), + (len - 1) / (sizeof(message_digest[0]) * 2) + 1 + ); + for(size_t i = 0; i < count; i++) { + buf.width(sizeof(message_digest[i]) * 2); + buf << (unsigned int)message_digest[i]; } - return buf.str(); + string hex = buf.str(); + hex.resize(len, '0'); // in case a partial element is requested + return hex; } -inline string sha1sum(const string& str) -{ +inline string sha1sum( + const string& str, + size_t len = sizeof(boost::uuids::detail::sha1::digest_type) * 2 +) { boost::uuids::detail::sha1 sha; + boost::uuids::detail::sha1::digest_type message_digest; + sha.reset(); sha.process_bytes(str.c_str(), str.length()); - - unsigned char message_digest[20]; sha.get_digest(message_digest); - return to_hex(message_digest, 20); + return digest_to_hex(message_digest, len); } extern const string version; |