Changeset 159164 in webkit

Timestamp:

Nov 12, 2013, 5:13:52 PM (11 years ago)

Author:

ap@apple.com

Message:

Implement key generation and JWK import for RSASSA-PKCS1-v1_5
​https://bugs.webkit.org/show_bug.cgi?id=124236

Source/WebCore:

Build fix.

• crypto/mac/CryptoKeyRSAMac.cpp: (WebCore::CryptoKeyRSA::buildAlgorithmDescription):

ifdef out some code on Mountain Lion. Bug 124249 track fixing this.

LayoutTests:

• platform/mac/TestExpectations: Update expectations for Mountain Lion.

I'll investigate this later.

• crypto/subtle/rsassa-pkcs1-v1_5-import-jwk.html: Quickly fail is promise is rejected.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/crypto/subtle/rsassa-pkcs1-v1_5-import-jwk.html (modified) (1 diff)
• LayoutTests/platform/mac/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/crypto/mac/CryptoKeyRSAMac.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-11-12  Alexey Proskuryakov  <ap@apple.com>
+
+        Implement key generation and JWK import for RSASSA-PKCS1-v1_5
+        https://bugs.webkit.org/show_bug.cgi?id=124236
+
+        * platform/mac/TestExpectations: Update expectations for Mountain Lion.
+        I'll investigate this later.
+
+        * crypto/subtle/rsassa-pkcs1-v1_5-import-jwk.html: Quickly fail is promise is rejected.
+
 2013-11-12  Alexey Proskuryakov  <ap@apple.com>
 

trunk/LayoutTests/crypto/subtle/rsassa-pkcs1-v1_5-import-jwk.html

@@ -61 +61 @@
     shouldBe("privateKey.algorithm.hash.name", "'sha-256'");
     finishJSTest();
+}, function(result) {
+    debug("FAIL");
+    finishJSTest();
 });
 </script>

trunk/LayoutTests/platform/mac/TestExpectations

@@ -1298 +1298 @@
 webkit.org/b/123522 [ Mavericks ] media/track/track-in-band-legacy-api.html [ Pass Failure ]
 
+# These tests are failing for multiple reasons, one of these being <webkit.org/b/124249>.
+[ MountainLion ] crypto/subtle/rsassa-pkcs1-v1_5-generate-key.html [ Skip ]
+[ MountainLion ] crypto/subtle/rsassa-pkcs1-v1_5-import-jwk.html [ Failure ]
+
 # Audio and video tracks aren't supported on mac
 media/track/audio

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-11-12  Alexey Proskuryakov  <ap@apple.com>
+
+        Implement key generation and JWK import for RSASSA-PKCS1-v1_5
+        https://bugs.webkit.org/show_bug.cgi?id=124236
+
+        Build fix.
+
+        * crypto/mac/CryptoKeyRSAMac.cpp: (WebCore::CryptoKeyRSA::buildAlgorithmDescription):
+        ifdef out some code on Mountain Lion. Bug 124249 track fixing this.
+
 2013-11-12  Joseph Pecoraro  <pecoraro@apple.com>
 

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

@@ -111 +111 @@
     ASSERT(CCRSAGetKeyType(m_platformKey) == ccRSAKeyPublic || CCRSAGetKeyType(m_platformKey) == ccRSAKeyPrivate);
     bool platformKeyIsPublic = CCRSAGetKeyType(m_platformKey) == ccRSAKeyPublic;
+#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
     CCRSACryptorRef publicKey = platformKeyIsPublic ? m_platformKey : CCRSACryptorGetPublicKeyFromPrivateKey(m_platformKey);
+#else
+    if (!platformKeyIsPublic)
+        return;
+    CCRSACryptorRef publicKey = m_platformKey;
+#endif
 
     size_t modulusLength;