Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1612)

Unified Diff: crypto/sha2.cc

Issue 1261333004: Add support for Flash Player Component updates on Linux (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase to fix merge conflicts Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: crypto/sha2.cc
diff --git a/crypto/sha2.cc b/crypto/sha2.cc
index 6f362379618f108fefad4f4394b6c4a3d6a54a85..cb281b38fcd4fd5a023924449397354604bd5524 100644
--- a/crypto/sha2.cc
+++ b/crypto/sha2.cc
@@ -11,9 +11,8 @@
namespace crypto {
void SHA256HashString(const base::StringPiece& str, void* output, size_t len) {
- scoped_ptr<SecureHash> ctx(SecureHash::Create(SecureHash::SHA256));
- ctx->Update(str.data(), str.length());
- ctx->Finish(output, len);
+ SHA256HashBytes(reinterpret_cast<const uint8_t*>(str.data()), str.length(),
+ output, len);
}
std::string SHA256HashString(const base::StringPiece& str) {
@@ -22,4 +21,13 @@ std::string SHA256HashString(const base::StringPiece& str) {
return output;
}
+void SHA256HashBytes(const uint8_t* data,
+ size_t len,
+ void* hash,
+ size_t out_len) {
+ scoped_ptr<SecureHash> ctx(SecureHash::Create(SecureHash::SHA256));
+ ctx->Update(data, len);
+ ctx->Finish(hash, out_len);
+}
+
} // namespace crypto

Powered by Google App Engine
This is Rietveld 408576698