Title: [159164] trunk
- Revision
- 159164
- Author
- [email protected]
- Date
- 2013-11-12 17:13:52 -0800 (Tue, 12 Nov 2013)
Log 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.
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (159163 => 159164)
--- trunk/LayoutTests/ChangeLog 2013-11-13 00:57:38 UTC (rev 159163)
+++ trunk/LayoutTests/ChangeLog 2013-11-13 01:13:52 UTC (rev 159164)
@@ -3,6 +3,16 @@
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 <[email protected]>
+
+ Implement key generation and JWK import for RSASSA-PKCS1-v1_5
+ https://bugs.webkit.org/show_bug.cgi?id=124236
+
Reviewed by Sam Weinig.
* crypto/subtle/resources/common.js:
Modified: trunk/LayoutTests/crypto/subtle/rsassa-pkcs1-v1_5-import-jwk.html (159163 => 159164)
--- trunk/LayoutTests/crypto/subtle/rsassa-pkcs1-v1_5-import-jwk.html 2013-11-13 00:57:38 UTC (rev 159163)
+++ trunk/LayoutTests/crypto/subtle/rsassa-pkcs1-v1_5-import-jwk.html 2013-11-13 01:13:52 UTC (rev 159164)
@@ -60,6 +60,9 @@
shouldBe("byteArrayToHexString(privateKey.algorithm.publicExponent)", "'[01 00 01]'");
shouldBe("privateKey.algorithm.hash.name", "'sha-256'");
finishJSTest();
+}, function(result) {
+ debug("FAIL");
+ finishJSTest();
});
</script>
Modified: trunk/LayoutTests/platform/mac/TestExpectations (159163 => 159164)
--- trunk/LayoutTests/platform/mac/TestExpectations 2013-11-13 00:57:38 UTC (rev 159163)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2013-11-13 01:13:52 UTC (rev 159164)
@@ -1297,6 +1297,10 @@
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
media/track/video
Modified: trunk/Source/WebCore/ChangeLog (159163 => 159164)
--- trunk/Source/WebCore/ChangeLog 2013-11-13 00:57:38 UTC (rev 159163)
+++ trunk/Source/WebCore/ChangeLog 2013-11-13 01:13:52 UTC (rev 159164)
@@ -1,3 +1,13 @@
+2013-11-12 Alexey Proskuryakov <[email protected]>
+
+ 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 <[email protected]>
Web Inspector: Extract InspectorAgentRegistry from InspectorBaseAgent
Modified: trunk/Source/WebCore/crypto/mac/CryptoKeyRSAMac.cpp (159163 => 159164)
--- trunk/Source/WebCore/crypto/mac/CryptoKeyRSAMac.cpp 2013-11-13 00:57:38 UTC (rev 159163)
+++ trunk/Source/WebCore/crypto/mac/CryptoKeyRSAMac.cpp 2013-11-13 01:13:52 UTC (rev 159164)
@@ -110,7 +110,13 @@
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;
size_t exponentLength;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
