Changeset 159299 in webkit

Timestamp:

Nov 14, 2013, 11:56:37 AM (11 years ago)

Author:

ap@apple.com

Message:

[Mac] HMAC sign/verify crashes when key is empty
​https://bugs.webkit.org/show_bug.cgi?id=124372

Reviewed by Sam Weinig.

Source/WebCore:

Test: crypto/subtle/hmac-sign-verify-empty-key.html

• crypto/mac/CryptoAlgorithmHMACMac.cpp: (WebCore::calculateSignature): Give it

a non-null pointer then.

LayoutTests:

• crypto/subtle/hmac-sign-verify-empty-key-expected.txt: Added.
• crypto/subtle/hmac-sign-verify-empty-key.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/crypto/subtle/hmac-sign-verify-empty-key-expected.txt (added)
• LayoutTests/crypto/subtle/hmac-sign-verify-empty-key.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/crypto/mac/CryptoAlgorithmHMACMac.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-11-14  Alexey Proskuryakov  <ap@apple.com>
+
+        [Mac] HMAC sign/verify crashes when key is empty
+        https://bugs.webkit.org/show_bug.cgi?id=124372
+
+        Reviewed by Sam Weinig.
+
+        * crypto/subtle/hmac-sign-verify-empty-key-expected.txt: Added.
+        * crypto/subtle/hmac-sign-verify-empty-key.html: Added.
+
 2013-11-14  Samuel White  <samuel_white@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-11-14  Alexey Proskuryakov  <ap@apple.com>
+
+        [Mac] HMAC sign/verify crashes when key is empty
+        https://bugs.webkit.org/show_bug.cgi?id=124372
+
+        Reviewed by Sam Weinig.
+
+        Test: crypto/subtle/hmac-sign-verify-empty-key.html
+
+        * crypto/mac/CryptoAlgorithmHMACMac.cpp: (WebCore::calculateSignature): Give it
+        a non-null pointer then.
+
 2013-11-14  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Source/WebCore/crypto/mac/CryptoAlgorithmHMACMac.cpp

@@ -84 +84 @@
 
     CCHmacContext context;
-    CCHmacInit(&context, algorithm, key.data(), key.size());
+    const char* keyData = key.data() ? key.data() : ""; // <rdar://problem/15467425> HMAC crashes when key pointer is null.
+    CCHmacInit(&context, algorithm, keyData, key.size());
     for (size_t i = 0, size = data.size(); i < size; ++i)
         CCHmacUpdate(&context, data[i].first, data[i].second);