Changeset 159393 in webkit

Timestamp:

Nov 17, 2013, 5:18:43 PM (11 years ago)

Author:

ap@apple.com

Message:

RSASSA-PKCS1-v1_5 JWK import doesn't check key size
​https://bugs.webkit.org/show_bug.cgi?id=124472

Reviewed by Sam Weinig.

Source/WebCore:

Test: crypto/subtle/rsassa-pkcs1-v1_5-import-jwk-small-key.html

• bindings/js/JSCryptoKeySerializationJWK.cpp:

(WebCore::JSCryptoKeySerializationJWK::keySizeIsValid): Added the checks.
(WebCore::JSCryptoKeySerializationJWK::keyDataRSAComponents): Check key size when
importing.
(WebCore::JSCryptoKeySerializationJWK::serialize): Updated a comment.

• crypto/keys/CryptoKeySerializationRaw.cpp: (WebCore::CryptoKeySerializationRaw::serialize):

Updated a comment.

LayoutTests:

• crypto/subtle/rsassa-pkcs1-v1_5-import-jwk-small-key-expected.txt: Added.
• crypto/subtle/rsassa-pkcs1-v1_5-import-jwk-small-key.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/crypto/subtle/rsassa-pkcs1-v1_5-import-jwk-small-key-expected.txt (added)
• LayoutTests/crypto/subtle/rsassa-pkcs1-v1_5-import-jwk-small-key.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/bindings/js/JSCryptoKeySerializationJWK.cpp (modified) (3 diffs)
• Source/WebCore/crypto/keys/CryptoKeySerializationRaw.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-11-17  Alexey Proskuryakov  <ap@apple.com>
+
+        RSASSA-PKCS1-v1_5 JWK import doesn't check key size
+        https://bugs.webkit.org/show_bug.cgi?id=124472
+
+        Reviewed by Sam Weinig.
+
+        * crypto/subtle/rsassa-pkcs1-v1_5-import-jwk-small-key-expected.txt: Added.
+        * crypto/subtle/rsassa-pkcs1-v1_5-import-jwk-small-key.html: Added.
+
 2013-11-17  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-11-17  Alexey Proskuryakov  <ap@apple.com>
+
+        RSASSA-PKCS1-v1_5 JWK import doesn't check key size
+        https://bugs.webkit.org/show_bug.cgi?id=124472
+
+        Reviewed by Sam Weinig.
+
+        Test: crypto/subtle/rsassa-pkcs1-v1_5-import-jwk-small-key.html
+
+        * bindings/js/JSCryptoKeySerializationJWK.cpp:
+        (WebCore::JSCryptoKeySerializationJWK::keySizeIsValid): Added the checks.
+        (WebCore::JSCryptoKeySerializationJWK::keyDataRSAComponents): Check key size when
+        importing.
+        (WebCore::JSCryptoKeySerializationJWK::serialize): Updated a comment.
+
+        * crypto/keys/CryptoKeySerializationRaw.cpp: (WebCore::CryptoKeySerializationRaw::serialize):
+        Updated a comment.
+
 2013-11-17  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Source/WebCore/bindings/js/JSCryptoKeySerializationJWK.cpp

@@ -278 +278 @@
     if (m_jwkAlgorithmName == "A256CBC")
         return sizeInBits == 256;
+    if (m_jwkAlgorithmName == "RS256")
+        return sizeInBits >= 2048;
+    if (m_jwkAlgorithmName == "RS384")
+        return sizeInBits >= 2048;
+    if (m_jwkAlgorithmName == "RS512")
+        return sizeInBits >= 2048;
     return true;
 }
@@ -313 +319 @@
         if (!m_exec->hadException())
             throwTypeError(m_exec, "Required JWK \"n\" member is missing");
+        return nullptr;
+    }
+
+    if (!keySizeIsValid(modulus.size() * 8)) {
+        throwTypeError(m_exec, "Key size is not valid for " + m_jwkAlgorithmName);
         return nullptr;
     }
@@ -505 +516 @@
     std::unique_ptr<CryptoKeyData> keyData = key.exportData();
     if (!keyData) {
-        // FIXME: Shouldn't happen once all key types implement exportData().
-        throwTypeError(exec, "Key doesn't support exportKey");
+        // This generally shouldn't happen as long as all key types implement exportData(), but as underlying libraries return errors, there may be some rare failure conditions.
+        throwTypeError(exec, "Couldn't export key material");
         return String();
     }

trunk/Source/WebCore/crypto/keys/CryptoKeySerializationRaw.cpp

@@ -66 +66 @@
     std::unique_ptr<CryptoKeyData> keyData = key.exportData();
     if (!keyData) {
-        // FIXME: Shouldn't happen once all key types implement exportData().
+        // This generally shouldn't happen as long as all key types implement exportData(), but as underlying libraries return errors, there may be some rare failure conditions.
         return false;
     }