Index: llvm/trunk/include/llvm/Support/MD5.h =================================================================== --- llvm/trunk/include/llvm/Support/MD5.h +++ llvm/trunk/include/llvm/Support/MD5.h @@ -31,6 +31,7 @@ #include "llvm/ADT/SmallString.h" #include "llvm/Support/DataTypes.h" #include "llvm/Support/Endian.h" +#include namespace llvm { template class ArrayRef; @@ -62,6 +63,9 @@ /// deposited into \p Str. The result will be of length 32. static void stringifyResult(MD5Result &Result, SmallString<32> &Str); + /// \brief Computes the hash for a given bytes. + static std::array hash(ArrayRef Data); + private: const uint8_t *body(ArrayRef Data); }; Index: llvm/trunk/include/llvm/Support/SHA1.h =================================================================== --- llvm/trunk/include/llvm/Support/SHA1.h +++ llvm/trunk/include/llvm/Support/SHA1.h @@ -18,6 +18,7 @@ #include "llvm/ADT/ArrayRef.h" +#include #include namespace llvm { @@ -53,6 +54,9 @@ /// made into update. StringRef result(); + /// Returns a raw 160-bit SHA1 hash for the given data. + static std::array hash(ArrayRef Data); + private: /// Define some constants. /// "static constexpr" would be cleaner but MSVC does not support it yet. Index: llvm/trunk/lib/Support/MD5.cpp =================================================================== --- llvm/trunk/lib/Support/MD5.cpp +++ llvm/trunk/lib/Support/MD5.cpp @@ -283,4 +283,14 @@ Res << format("%.2x", Result[i]); } +std::array MD5::hash(ArrayRef Data) { + MD5 Hash; + Hash.update(Data); + MD5::MD5Result Res; + Hash.final(Res); + + std::array Arr; + memcpy(Arr.data(), Res, sizeof(Res)); + return Arr; +} } Index: llvm/trunk/lib/Support/SHA1.cpp =================================================================== --- llvm/trunk/lib/Support/SHA1.cpp +++ llvm/trunk/lib/Support/SHA1.cpp @@ -269,3 +269,13 @@ // Return pointer to hash (20 characters) return Hash; } + +std::array SHA1::hash(ArrayRef Data) { + SHA1 Hash; + Hash.update(Data); + StringRef S = Hash.final().data(); + + std::array Arr; + memcpy(Arr.data(), S.data(), S.size()); + return Arr; +} Index: llvm/trunk/unittests/Support/MD5Test.cpp =================================================================== --- llvm/trunk/unittests/Support/MD5Test.cpp +++ llvm/trunk/unittests/Support/MD5Test.cpp @@ -57,4 +57,14 @@ "81948d1f1554f58cd1a56ebb01f808cb"); TestMD5Sum("abcdefghijklmnopqrstuvwxyz", "c3fcd3d76192e4007dfb496cca67e13b"); } + +TEST(MD5HashTest, MD5) { + ArrayRef Input((const uint8_t *)"abcdefghijklmnopqrstuvwxyz", 26); + std::array Vec = MD5::hash(Input); + MD5::MD5Result MD5Res; + SmallString<32> Res; + memcpy(MD5Res, Vec.data(), Vec.size()); + MD5::stringifyResult(MD5Res, Res); + EXPECT_EQ(Res, "c3fcd3d76192e4007dfb496cca67e13b"); +} } Index: llvm/trunk/unittests/Support/raw_sha1_ostream_test.cpp =================================================================== --- llvm/trunk/unittests/Support/raw_sha1_ostream_test.cpp +++ llvm/trunk/unittests/Support/raw_sha1_ostream_test.cpp @@ -37,6 +37,13 @@ ASSERT_EQ("2EF7BDE608CE5404E97D5F042F95F89F1C232871", Hash); } +TEST(sha1_hash_test, Basic) { + ArrayRef Input((const uint8_t *)"Hello World!", 12); + std::array Vec = SHA1::hash(Input); + std::string Hash = toHex({(const char *)Vec.data(), 20}); + ASSERT_EQ("2EF7BDE608CE5404E97D5F042F95F89F1C232871", Hash); +} + // Check that getting the intermediate hash in the middle of the stream does // not invalidate the final result. TEST(raw_sha1_ostreamTest, Intermediate) {