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

Unified Diff: crypto/hmac.cc

Issue 8124011: Add constant-time comparison operators for cryptographic uses. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 2 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
« no previous file with comments | « crypto/crypto.gyp ('k') | crypto/secure_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: crypto/hmac.cc
===================================================================
--- crypto/hmac.cc (revision 103793)
+++ crypto/hmac.cc (working copy)
@@ -7,28 +7,10 @@
#include <algorithm>
#include "base/logging.h"
+#include "crypto/secure_util.h"
namespace crypto {
-// Performs a constant-time comparison of two strings, returning true if the
-// strings are equal.
-//
-// For cryptographic operations, comparison functions such as memcmp() may
-// expose side-channel information about input, allowing an attacker to
-// perform timing analysis to determine what the expected bits should be. In
-// order to avoid such attacks, the comparison must execute in constant time,
-// so as to not to reveal to the attacker where the difference(s) are.
-// For an example attack, see
-// http://groups.google.com/group/keyczar-discuss/browse_thread/thread/5571eca0948b2a13
-static bool SecureMemcmp(const void* s1, const void* s2, size_t n) {
- const unsigned char* s1_ptr = reinterpret_cast<const unsigned char*>(s1);
- const unsigned char* s2_ptr = reinterpret_cast<const unsigned char*>(s2);
- unsigned char tmp = 0;
- for (size_t i = 0; i < n; ++i, ++s1_ptr, ++s2_ptr)
- tmp |= *s1_ptr ^ *s2_ptr;
- return (tmp == 0);
-}
-
size_t HMAC::DigestLength() const {
switch (hash_alg_) {
case SHA1:
@@ -58,8 +40,8 @@
if (!Sign(data, computed_digest.get(), static_cast<int>(digest_length)))
return false;
- return SecureMemcmp(digest.data(), computed_digest.get(),
- std::min(digest.size(), digest_length));
+ return SecureMemEqual(digest.data(), computed_digest.get(),
+ std::min(digest.size(), digest_length));
}
} // namespace crypto
« no previous file with comments | « crypto/crypto.gyp ('k') | crypto/secure_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698