Changeset 182895 in webkit

Timestamp:

Apr 16, 2015, 10:44:13 AM (11 years ago)

Author:

Antti Koivisto

Message:

Use CommonCrypto for SHA1 and MD5
​https://bugs.webkit.org/show_bug.cgi?id=143826

Reviewed by Anders Carlsson.

CommonCrypto SHA1 implementation is ~4x faster than the naive WTF one. Use it when available.

These are covered by existing API tests.

• wtf/MD5.cpp:

(WTF::MD5::MD5):
(WTF::MD5::addBytes):
(WTF::MD5::checksum):

• wtf/MD5.h:
• wtf/SHA1.cpp:

(WTF::SHA1::SHA1):
(WTF::SHA1::addBytes):
(WTF::SHA1::computeHash):

Remove the side effect where computeHash resets the state. No one relies on it.

(WTF::SHA1::hexDigest):
(WTF::SHA1::computeHexDigest):

• wtf/SHA1.h:

Location:

trunk/Source/WTF

Files:

• ChangeLog (modified) (1 diff)
• wtf/MD5.cpp (modified) (3 diffs)
• wtf/MD5.h (modified) (2 diffs)
• wtf/SHA1.cpp (modified) (4 diffs)
• wtf/SHA1.h (modified) (4 diffs)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2015-04-16  Antti Koivisto  <antti@apple.com>
+
+        Use CommonCrypto for SHA1 and MD5
+        https://bugs.webkit.org/show_bug.cgi?id=143826
+
+        Reviewed by Anders Carlsson.
+
+        CommonCrypto SHA1 implementation is ~4x faster than the naive WTF one. Use it when available.
+
+        These are covered by existing API tests.
+
+        * wtf/MD5.cpp:
+        (WTF::MD5::MD5):
+        (WTF::MD5::addBytes):
+        (WTF::MD5::checksum):
+        * wtf/MD5.h:
+        * wtf/SHA1.cpp:
+        (WTF::SHA1::SHA1):
+        (WTF::SHA1::addBytes):
+        (WTF::SHA1::computeHash):
+
+            Remove the side effect where computeHash resets the state. No one relies on it.
+
+        (WTF::SHA1::hexDigest):
+        (WTF::SHA1::computeHexDigest):
+        * wtf/SHA1.h:
+
 2015-04-16  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/Source/WTF/wtf/MD5.cpp

@@ -3 +3 @@
 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -59 +60 @@
 namespace WTF {
 
+#if PLATFORM(COCOA)
+
+MD5::MD5()
+{
+    CC_MD5_Init(&m_context);
+}
+
+void MD5::addBytes(const uint8_t* input, size_t length)
+{
+    CC_MD5_Update(&m_context, input, length);
+}
+
+void MD5::checksum(Digest& hash)
+{
+    CC_MD5_Final(hash.data(), &m_context);
+}
+    
+#else
+
 // Note: this code is harmless on little-endian machines.
 
@@ -265 +285 @@
 }
 
+#endif
+
 } // namespace WTF

trunk/Source/WTF/wtf/MD5.h

@@ -35 +35 @@
 #include <wtf/Vector.h>
 
+#if PLATFORM(COCOA)
+#include <CommonCrypto/CommonDigest.h>
+#endif
+
 namespace WTF {
 
@@ -57 +61 @@
 
 private:
+#if PLATFORM(COCOA)
+    CC_MD5_CTX m_context;
+#else
     uint32_t m_buf[4];
     uint32_t m_bits[2];
     uint8_t m_in[64];
+#endif
 };
 

trunk/Source/WTF/wtf/SHA1.cpp

@@ -1 +1 @@
 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -29 +30 @@
  */
 
+#include "config.h"
+#include "SHA1.h"
+
+#include "Assertions.h"
+
+#include "StringExtras.h"
+#include "text/CString.h"
+
+namespace WTF {
+
+#if PLATFORM(COCOA)
+
+SHA1::SHA1()
+{
+    CC_SHA1_Init(&m_context);
+}
+
+void SHA1::addBytes(const uint8_t* input, size_t length)
+{
+    CC_SHA1_Update(&m_context, input, length);
+}
+
+void SHA1::computeHash(Digest& hash)
+{
+    CC_SHA1_Final(hash.data(), &m_context);
+}
+
+#else
+
 // A straightforward SHA-1 implementation based on RFC 3174.
 // http://www.ietf.org/rfc/rfc3174.txt
 // The names of functions and variables (such as "a", "b", and "f") follow notations in RFC 3174.
-
-#include "config.h"
-#include "SHA1.h"
-
-#include "Assertions.h"
-
-#include "StringExtras.h"
-#include "text/CString.h"
-
-namespace WTF {
 
 static inline uint32_t f(int t, uint32_t b, uint32_t c, uint32_t d)
@@ -105 +125 @@
 }
 
-CString SHA1::hexDigest(const Digest& digest)
-{
-    char* start = 0;
-    CString result = CString::newUninitialized(40, start);
-    char* buffer = start;
-    for (size_t i = 0; i < hashSize; ++i) {
-        snprintf(buffer, 3, "%02X", digest.at(i));
-        buffer += 2;
-    }
-    return result;
-}
-
-CString SHA1::computeHexDigest()
-{
-    Digest digest;
-    computeHash(digest);
-    return hexDigest(digest);
-}
-
 void SHA1::finalize()
 {
@@ -196 +197 @@
 }
 
+#endif
+
+CString SHA1::hexDigest(const Digest& digest)
+{
+    char* start = 0;
+    CString result = CString::newUninitialized(40, start);
+    char* buffer = start;
+    for (size_t i = 0; i < hashSize; ++i) {
+        snprintf(buffer, 3, "%02X", digest.at(i));
+        buffer += 2;
+    }
+    return result;
+}
+
+CString SHA1::computeHexDigest()
+{
+    Digest digest;
+    computeHash(digest);
+    return hexDigest(digest);
+}
+
 } // namespace WTF

trunk/Source/WTF/wtf/SHA1.h

@@ -36 +36 @@
 #include <wtf/text/CString.h>
 
+#if PLATFORM(COCOA)
+#include <CommonCrypto/CommonDigest.h>
+#endif
+
 namespace WTF {
 
@@ -64 +68 @@
     typedef std::array<uint8_t, hashSize> Digest;
 
-    // computeHash has a side effect of resetting the state of the object.
     WTF_EXPORT_PRIVATE void computeHash(Digest&);
     
@@ -74 +77 @@
 
 private:
+#if PLATFORM(COCOA)
+    CC_SHA1_CTX m_context;
+#else
     void finalize();
     void processBlock();
@@ -82 +88 @@
     uint64_t m_totalBytes; // Number of bytes added so far.
     uint32_t m_hash[5];
+#endif
 };