diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog index a2739b379b5d1a575091c19a41b9e5541690315e..8c37e77e1111c8a70a98bcf8302196cab077794d 100644 --- a/LayoutTests/ChangeLog +++ b/LayoutTests/ChangeLog @@ -1,3 +1,60 @@ +2013-10-31 Alexey Proskuryakov + + Enable WebCrypto on Mac + https://bugs.webkit.org/show_bug.cgi?id=123587 + + Reviewed by Anders Carlsson. + + * TestExpectations: + * platform/efl/TestExpectations: + * platform/gtk/TestExpectations: + * platform/win/TestExpectations: + * platform/wincairo/TestExpectations: + Only skipping on specific platforms now. + + * crypto: Added. + * crypto/crypto-gc-expected.txt: Copied from LayoutTests/security/crypto-gc-expected.txt. + * crypto/crypto-gc.html: Copied from LayoutTests/security/crypto-gc.html. + * crypto/crypto-random-values-expected.txt: Copied from LayoutTests/security/crypto-random-values-expected.txt. + * crypto/crypto-random-values-limits-expected.txt: Copied from LayoutTests/security/crypto-random-values-limits-expected.txt. + * crypto/crypto-random-values-limits.html: Copied from LayoutTests/security/crypto-random-values-limits.html. + * crypto/crypto-random-values-types-expected.txt: Copied from LayoutTests/security/crypto-random-values-types-expected.txt. + * crypto/crypto-random-values-types.html: Copied from LayoutTests/security/crypto-random-values-types.html. + * crypto/crypto-random-values.html: Copied from LayoutTests/security/crypto-random-values.html. + * crypto/subtle: Added. + * crypto/subtle/argument-conversion-expected.txt: Copied from LayoutTests/security/crypto-subtle-arguments-expected.txt. + * crypto/subtle/argument-conversion.html: Copied from LayoutTests/security/crypto-subtle-arguments.html. + * crypto/subtle/gc-2-expected.txt: Copied from LayoutTests/security/crypto-subtle-gc-2-expected.txt. + * crypto/subtle/gc-2.html: Copied from LayoutTests/security/crypto-subtle-gc-2.html. + * crypto/subtle/gc-3-expected.txt: Copied from LayoutTests/security/crypto-subtle-gc-3-expected.txt. + * crypto/subtle/gc-3.html: Copied from LayoutTests/security/crypto-subtle-gc-3.html. + * crypto/subtle/gc-expected.txt: Copied from LayoutTests/security/crypto-subtle-gc-expected.txt. + * crypto/subtle/gc.html: Copied from LayoutTests/security/crypto-subtle-gc.html. + * crypto/subtle/resources: Added. + * crypto/subtle/resources/common.js: Copied from LayoutTests/security/resources/common.js. + * crypto/subtle/sha-1-expected.txt: Copied from LayoutTests/security/crypto-subtle-sha1-expected.txt. + * crypto/subtle/sha-1.html: Copied from LayoutTests/security/crypto-subtle-sha1.html. + * security/crypto-gc-expected.txt: Removed. + * security/crypto-gc.html: Removed. + * security/crypto-random-values-expected.txt: Removed. + * security/crypto-random-values-limits-expected.txt: Removed. + * security/crypto-random-values-limits.html: Removed. + * security/crypto-random-values-types-expected.txt: Removed. + * security/crypto-random-values-types.html: Removed. + * security/crypto-random-values.html: Removed. + * security/crypto-subtle-arguments-expected.txt: Removed. + * security/crypto-subtle-arguments.html: Removed. + * security/crypto-subtle-gc-2-expected.txt: Removed. + * security/crypto-subtle-gc-2.html: Removed. + * security/crypto-subtle-gc-3-expected.txt: Removed. + * security/crypto-subtle-gc-3.html: Removed. + * security/crypto-subtle-gc-expected.txt: Removed. + * security/crypto-subtle-gc.html: Removed. + * security/crypto-subtle-sha1-expected.txt: Removed. + * security/crypto-subtle-sha1.html: Removed. + * security/resources/common.js: Removed. + Moved tests from security/ to crypto/. + 2013-10-31 Myles C. Maxfield Move CSS3 text decoration implementation behind ENABLE(CSS3_TEXT_DECORATION) diff --git a/LayoutTests/TestExpectations b/LayoutTests/TestExpectations index c55fa67d7dba6e606b849c4cf091b9c36ae9e8d5..7f8d70d19a89c01a519aac47b73b098e9bd5d80f 100644 --- a/LayoutTests/TestExpectations +++ b/LayoutTests/TestExpectations @@ -71,12 +71,5 @@ fast/mediastream/MediaStream-clone.html [ Skip ] # Skipping it for now, then put it again when the spec decides it fast/mediastream/MediaStream-onended.html [ Skip ] -# crypto.subtle is not yet enabled on any ports -webkit.org/b/122679 security/crypto-subtle-gc.html [ Skip ] -webkit.org/b/122679 security/crypto-subtle-gc-2.html [ Skip ] -webkit.org/b/122679 security/crypto-subtle-gc-3.html [ Skip ] -webkit.org/b/122679 security/crypto-subtle-sha1.html [ Skip ] -webkit.org/b/122679 security/crypto-subtle-arguments.html [ Skip ] - webkit.org/b/123555 [ Debug ] media/media-fragments/TC0054.html [ Crash ] webkit.org/b/123555 [ Debug ] media/media-fragments/TC0061.html [ Crash ] diff --git a/LayoutTests/security/crypto-gc-expected.txt b/LayoutTests/crypto/crypto-gc-expected.txt similarity index 100% rename from LayoutTests/security/crypto-gc-expected.txt rename to LayoutTests/crypto/crypto-gc-expected.txt diff --git a/LayoutTests/security/crypto-gc.html b/LayoutTests/crypto/crypto-gc.html similarity index 100% rename from LayoutTests/security/crypto-gc.html rename to LayoutTests/crypto/crypto-gc.html diff --git a/LayoutTests/security/crypto-random-values-expected.txt b/LayoutTests/crypto/crypto-random-values-expected.txt similarity index 100% rename from LayoutTests/security/crypto-random-values-expected.txt rename to LayoutTests/crypto/crypto-random-values-expected.txt diff --git a/LayoutTests/security/crypto-random-values-limits-expected.txt b/LayoutTests/crypto/crypto-random-values-limits-expected.txt similarity index 100% rename from LayoutTests/security/crypto-random-values-limits-expected.txt rename to LayoutTests/crypto/crypto-random-values-limits-expected.txt diff --git a/LayoutTests/security/crypto-random-values-limits.html b/LayoutTests/crypto/crypto-random-values-limits.html similarity index 100% rename from LayoutTests/security/crypto-random-values-limits.html rename to LayoutTests/crypto/crypto-random-values-limits.html diff --git a/LayoutTests/security/crypto-random-values-types-expected.txt b/LayoutTests/crypto/crypto-random-values-types-expected.txt similarity index 100% rename from LayoutTests/security/crypto-random-values-types-expected.txt rename to LayoutTests/crypto/crypto-random-values-types-expected.txt diff --git a/LayoutTests/security/crypto-random-values-types.html b/LayoutTests/crypto/crypto-random-values-types.html similarity index 100% rename from LayoutTests/security/crypto-random-values-types.html rename to LayoutTests/crypto/crypto-random-values-types.html diff --git a/LayoutTests/security/crypto-random-values.html b/LayoutTests/crypto/crypto-random-values.html similarity index 100% rename from LayoutTests/security/crypto-random-values.html rename to LayoutTests/crypto/crypto-random-values.html diff --git a/LayoutTests/security/crypto-subtle-arguments-expected.txt b/LayoutTests/crypto/subtle/argument-conversion-expected.txt similarity index 100% rename from LayoutTests/security/crypto-subtle-arguments-expected.txt rename to LayoutTests/crypto/subtle/argument-conversion-expected.txt diff --git a/LayoutTests/security/crypto-subtle-arguments.html b/LayoutTests/crypto/subtle/argument-conversion.html similarity index 95% rename from LayoutTests/security/crypto-subtle-arguments.html rename to LayoutTests/crypto/subtle/argument-conversion.html index bcfa36d7aec9421ac6f5e87982393deae75b55e1..46a44859d8920867786cfa48428dfb4e73eb4126 100644 --- a/LayoutTests/security/crypto-subtle-arguments.html +++ b/LayoutTests/crypto/subtle/argument-conversion.html @@ -1,7 +1,7 @@ - + @@ -60,6 +60,6 @@ Promise.fulfill(null).then(function() { - + diff --git a/LayoutTests/security/crypto-subtle-gc-2-expected.txt b/LayoutTests/crypto/subtle/gc-2-expected.txt similarity index 100% rename from LayoutTests/security/crypto-subtle-gc-2-expected.txt rename to LayoutTests/crypto/subtle/gc-2-expected.txt diff --git a/LayoutTests/security/crypto-subtle-gc-2.html b/LayoutTests/crypto/subtle/gc-2.html similarity index 88% rename from LayoutTests/security/crypto-subtle-gc-2.html rename to LayoutTests/crypto/subtle/gc-2.html index d4fe4579f52e026304d6f998ae4379239ab791b8..9129920682b8907a353b56fc8c2381b50e042578 100644 --- a/LayoutTests/security/crypto-subtle-gc-2.html +++ b/LayoutTests/crypto/subtle/gc-2.html @@ -2,7 +2,7 @@ - + - + diff --git a/LayoutTests/security/crypto-subtle-gc-3-expected.txt b/LayoutTests/crypto/subtle/gc-3-expected.txt similarity index 100% rename from LayoutTests/security/crypto-subtle-gc-3-expected.txt rename to LayoutTests/crypto/subtle/gc-3-expected.txt diff --git a/LayoutTests/security/crypto-subtle-gc-3.html b/LayoutTests/crypto/subtle/gc-3.html similarity index 87% rename from LayoutTests/security/crypto-subtle-gc-3.html rename to LayoutTests/crypto/subtle/gc-3.html index 7a791aa520535c98ac04118dc511d055a93e7d28..b6e0740a9b6f0a89f46dd13f40b0a2c5ecdf7546 100644 --- a/LayoutTests/security/crypto-subtle-gc-3.html +++ b/LayoutTests/crypto/subtle/gc-3.html @@ -2,7 +2,7 @@ - + - + diff --git a/LayoutTests/security/crypto-subtle-gc-expected.txt b/LayoutTests/crypto/subtle/gc-expected.txt similarity index 100% rename from LayoutTests/security/crypto-subtle-gc-expected.txt rename to LayoutTests/crypto/subtle/gc-expected.txt diff --git a/LayoutTests/security/crypto-subtle-gc.html b/LayoutTests/crypto/subtle/gc.html similarity index 82% rename from LayoutTests/security/crypto-subtle-gc.html rename to LayoutTests/crypto/subtle/gc.html index 601b019804eb2b26eff909dc1adb69ceff049f87..a235b0bde9dce70c6088a6a09b869f2503e4d4eb 100644 --- a/LayoutTests/security/crypto-subtle-gc.html +++ b/LayoutTests/crypto/subtle/gc.html @@ -2,7 +2,7 @@ - + - + diff --git a/LayoutTests/security/resources/common.js b/LayoutTests/crypto/subtle/resources/common.js similarity index 100% rename from LayoutTests/security/resources/common.js rename to LayoutTests/crypto/subtle/resources/common.js diff --git a/LayoutTests/security/crypto-subtle-sha1-expected.txt b/LayoutTests/crypto/subtle/sha-1-expected.txt similarity index 100% rename from LayoutTests/security/crypto-subtle-sha1-expected.txt rename to LayoutTests/crypto/subtle/sha-1-expected.txt diff --git a/LayoutTests/security/crypto-subtle-sha1.html b/LayoutTests/crypto/subtle/sha-1.html similarity index 92% rename from LayoutTests/security/crypto-subtle-sha1.html rename to LayoutTests/crypto/subtle/sha-1.html index 277ee742336f18df7aa4166b3ff913dfcf9db911..467e66cb51f9cf072c32f8bf8ce395db2b9dd6cc 100644 --- a/LayoutTests/security/crypto-subtle-sha1.html +++ b/LayoutTests/crypto/subtle/sha-1.html @@ -1,7 +1,7 @@ - + @@ -43,6 +43,6 @@ Promise.fulfill(null).then(function() { }); - + diff --git a/LayoutTests/platform/efl/TestExpectations b/LayoutTests/platform/efl/TestExpectations index 6e4b81582c2e440bead40dc234f1290ce9e4f657..707c2033d02c654b51a24b2b70e121258905b9a0 100644 --- a/LayoutTests/platform/efl/TestExpectations +++ b/LayoutTests/platform/efl/TestExpectations @@ -1588,3 +1588,6 @@ webkit.org/b/123561 printing/setPrinting.html [ Missing ] webkit.org/b/123561 printing/simultaneous-position-float-change.html [ Missing ] webkit.org/b/123561 printing/single-line-must-not-be-split-into-two-pages.html [ Missing ] webkit.org/b/123561 printing/width-overflow.html [ Missing ] + +# crypto.subtle is not yet enabled +crypto/subtle [ Skip ] diff --git a/LayoutTests/platform/gtk/TestExpectations b/LayoutTests/platform/gtk/TestExpectations index 9bfcf4d25890a04e281677148ec378c1d155aea7..68e47b16a20f4f6d7c8989d2bf5c0d233d700725 100644 --- a/LayoutTests/platform/gtk/TestExpectations +++ b/LayoutTests/platform/gtk/TestExpectations @@ -456,6 +456,9 @@ webkit.org/b/107194 http/tests/security/no-indexeddb-from-sandbox.html [ Skip ] # Needs to update the gtk databaseQuotaExceeded() test function to handle quota expansion requests. storage/websql/open-database-expand-quota.html [ Failure ] +# crypto.subtle is not yet enabled +crypto/subtle [ Skip ] + #//////////////////////////////////////////////////////////////////////////////////////// # End of Expected failures #//////////////////////////////////////////////////////////////////////////////////////// diff --git a/LayoutTests/platform/win/TestExpectations b/LayoutTests/platform/win/TestExpectations index 7a999df4612d180771ce7a657c188078e6a060f9..ab84804bd3f96fd2ab62cd069ce66b5a0d54a157 100644 --- a/LayoutTests/platform/win/TestExpectations +++ b/LayoutTests/platform/win/TestExpectations @@ -2875,4 +2875,5 @@ printing/print-close-crash.html # Test introduced in r157133 fails. State of colorspace management on Windows is unclear. media/video-canvas-drawing-output.html - +# crypto.subtle is not yet enabled +crypto/subtle [ Skip ] diff --git a/LayoutTests/platform/wincairo/TestExpectations b/LayoutTests/platform/wincairo/TestExpectations index 13a53427a29deea8b70665a13c2f6eb8be6064f5..f02e4e150f6f44130a3839ec888851379f948e91 100644 --- a/LayoutTests/platform/wincairo/TestExpectations +++ b/LayoutTests/platform/wincairo/TestExpectations @@ -2850,3 +2850,6 @@ webkit.org/b/?????? http/tests/loading/promote-img-preload-priority.html [ Failu # No concept of secure text input editing/secure-input [ Failure ] + +# crypto.subtle is not yet enabled +crypto/subtle [ Skip ] diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog index 65c301ca5bddd5773aaadb4de83e6f6c3fabbf66..17cb69582e0ef77c91503313a79762bb8f3c595c 100644 --- a/Source/JavaScriptCore/ChangeLog +++ b/Source/JavaScriptCore/ChangeLog @@ -1,3 +1,12 @@ +2013-10-31 Alexey Proskuryakov + + Enable WebCrypto on Mac + https://bugs.webkit.org/show_bug.cgi?id=123587 + + Reviewed by Anders Carlsson. + + * Configurations/FeatureDefines.xcconfig: Do it. + 2013-10-31 Filip Pizlo Unreviewed, really remove CachedTranscendentalFunction.h. diff --git a/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig b/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig index d4d86c8269c377d7aac0193945919abc41221d73..6a5cf51ec1969df06fb4acf90371f9ee20abe853 100644 --- a/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig +++ b/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig @@ -155,7 +155,7 @@ ENABLE_SPEECH_SYNTHESIS = $(ENABLE_SPEECH_SYNTHESIS_$(PLATFORM_NAME)); ENABLE_SPEECH_SYNTHESIS_macosx = ENABLE_SPEECH_SYNTHESIS; ENABLE_SQL_DATABASE = ENABLE_SQL_DATABASE; ENABLE_SUBPIXEL_LAYOUT = ; -ENABLE_SUBTLE_CRYPTO = ; +ENABLE_SUBTLE_CRYPTO = ENABLE_SUBTLE_CRYPTO; ENABLE_SVG = ENABLE_SVG; ENABLE_SVG_FONTS = ENABLE_SVG_FONTS; ENABLE_TEMPLATE_ELEMENT = ; diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index b4dc081e55d52620aa42a529c83d1f8964628db3..f369fe8f53d47150f2be9d230f7995a4c48307e4 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,3 +1,20 @@ +2013-10-31 Alexey Proskuryakov + + Enable WebCrypto on Mac + https://bugs.webkit.org/show_bug.cgi?id=123587 + + Reviewed by Anders Carlsson. + + * Configurations/FeatureDefines.xcconfig: Enable it. + + * bindings/js/JSCryptoAlgorithmDictionary.cpp: Build fix. + + * crypto/CryptoAlgorithmRegistry.cpp: (WebCore::CryptoAlgorithmRegistry::getIdentifierForName): + Special case empty keys to avoid upsetting HashMap. + + * crypto/algorithms/CryptoAlgorithmSHA1.cpp: (WebCore::CryptoAlgorithmSHA1::create): + Build fix. Can't use make_unique, because constructor is private. + 2013-10-31 Myles C. Maxfield Underline bounds cannot be queried before underline itself is drawn diff --git a/Source/WebCore/Configurations/FeatureDefines.xcconfig b/Source/WebCore/Configurations/FeatureDefines.xcconfig index 30c89a51d3512bfb739e531734b8b45cb93bfd19..1d2fabf8638c40a0183fdaf1d2380298c43bdc5e 100644 --- a/Source/WebCore/Configurations/FeatureDefines.xcconfig +++ b/Source/WebCore/Configurations/FeatureDefines.xcconfig @@ -155,7 +155,7 @@ ENABLE_SPEECH_SYNTHESIS = $(ENABLE_SPEECH_SYNTHESIS_$(PLATFORM_NAME)); ENABLE_SPEECH_SYNTHESIS_macosx = ENABLE_SPEECH_SYNTHESIS; ENABLE_SQL_DATABASE = ENABLE_SQL_DATABASE; ENABLE_SUBPIXEL_LAYOUT = ; -ENABLE_SUBTLE_CRYPTO = ; +ENABLE_SUBTLE_CRYPTO = ENABLE_SUBTLE_CRYPTO; ENABLE_SVG = ENABLE_SVG; ENABLE_SVG_FONTS = ENABLE_SVG_FONTS; ENABLE_TEMPLATE_ELEMENT = ; diff --git a/Source/WebCore/bindings/js/JSCryptoAlgorithmBuilder.cpp b/Source/WebCore/bindings/js/JSCryptoAlgorithmBuilder.cpp index 2567cdcfcbda008e1d2e68d722c8ce2ec07ca844..7b9327ff34447ef7448ce8d1a84e7ee7680446f9 100644 --- a/Source/WebCore/bindings/js/JSCryptoAlgorithmBuilder.cpp +++ b/Source/WebCore/bindings/js/JSCryptoAlgorithmBuilder.cpp @@ -29,6 +29,7 @@ #if ENABLE(SUBTLE_CRYPTO) #include +#include using namespace JSC; diff --git a/Source/WebCore/bindings/js/JSCryptoAlgorithmDictionary.cpp b/Source/WebCore/bindings/js/JSCryptoAlgorithmDictionary.cpp index 5fc34dfcdb3cbd000d33af5d432fe35bbbbfa6fb..f7349857b2d61538047011885273cf5ad845383b 100644 --- a/Source/WebCore/bindings/js/JSCryptoAlgorithmDictionary.cpp +++ b/Source/WebCore/bindings/js/JSCryptoAlgorithmDictionary.cpp @@ -28,7 +28,6 @@ #if ENABLE(SUBTLE_CRYPTO) -#include "CryptoAlgorithmHMAC.h" #include "CryptoAlgorithmHmacKeyParams.h" #include "CryptoAlgorithmHmacParams.h" #include "CryptoAlgorithmRegistry.h" @@ -149,7 +148,7 @@ static std::unique_ptr createHmacKeyParams(JSC::ExecS return std::move(result); } -std::unique_ptr JSCryptoAlgorithmDictionary::createParametersForEncrypt(JSC::ExecState* exec, CryptoAlgorithmIdentifier, JSC::JSValue) +std::unique_ptr JSCryptoAlgorithmDictionary::createParametersForEncrypt(JSC::ExecState* exec, CryptoAlgorithmIdentifier algorithm, JSC::JSValue) { switch (algorithm) { case CryptoAlgorithmIdentifier::RSAES_PKCS1_v1_5: @@ -178,7 +177,7 @@ std::unique_ptr JSCryptoAlgorithmDictionary::createPa } } -std::unique_ptr JSCryptoAlgorithmDictionary::createParametersForDecrypt(JSC::ExecState* exec, CryptoAlgorithmIdentifier, JSC::JSValue) +std::unique_ptr JSCryptoAlgorithmDictionary::createParametersForDecrypt(JSC::ExecState* exec, CryptoAlgorithmIdentifier algorithm, JSC::JSValue) { switch (algorithm) { case CryptoAlgorithmIdentifier::RSAES_PKCS1_v1_5: @@ -303,7 +302,7 @@ std::unique_ptr JSCryptoAlgorithmDictionary::createPa } } -std::unique_ptr JSCryptoAlgorithmDictionary::createParametersForGenerateKey(JSC::ExecState* exec, CryptoAlgorithmIdentifier, JSC::JSValue) +std::unique_ptr JSCryptoAlgorithmDictionary::createParametersForGenerateKey(JSC::ExecState* exec, CryptoAlgorithmIdentifier algorithm, JSC::JSValue) { switch (algorithm) { case CryptoAlgorithmIdentifier::RSAES_PKCS1_v1_5: @@ -332,7 +331,7 @@ std::unique_ptr JSCryptoAlgorithmDictionary::createPa } } -std::unique_ptr JSCryptoAlgorithmDictionary::createParametersForDeriveKey(JSC::ExecState* exec, CryptoAlgorithmIdentifier, JSC::JSValue) +std::unique_ptr JSCryptoAlgorithmDictionary::createParametersForDeriveKey(JSC::ExecState* exec, CryptoAlgorithmIdentifier algorithm, JSC::JSValue) { switch (algorithm) { case CryptoAlgorithmIdentifier::RSAES_PKCS1_v1_5: @@ -361,7 +360,7 @@ std::unique_ptr JSCryptoAlgorithmDictionary::createPa } } -std::unique_ptr JSCryptoAlgorithmDictionary::createParametersForDeriveBits(JSC::ExecState* exec, CryptoAlgorithmIdentifier, JSC::JSValue) +std::unique_ptr JSCryptoAlgorithmDictionary::createParametersForDeriveBits(JSC::ExecState* exec, CryptoAlgorithmIdentifier algorithm, JSC::JSValue) { switch (algorithm) { case CryptoAlgorithmIdentifier::RSAES_PKCS1_v1_5: @@ -422,7 +421,7 @@ std::unique_ptr JSCryptoAlgorithmDictionary::createPa } } -std::unique_ptr JSCryptoAlgorithmDictionary::createParametersForExportKey(JSC::ExecState* exec, CryptoAlgorithmIdentifier, JSC::JSValue) +std::unique_ptr JSCryptoAlgorithmDictionary::createParametersForExportKey(JSC::ExecState* exec, CryptoAlgorithmIdentifier algorithm, JSC::JSValue) { switch (algorithm) { case CryptoAlgorithmIdentifier::RSAES_PKCS1_v1_5: @@ -451,7 +450,7 @@ std::unique_ptr JSCryptoAlgorithmDictionary::createPa } } -std::unique_ptr JSCryptoAlgorithmDictionary::createParametersForWrapKey(JSC::ExecState* exec, CryptoAlgorithmIdentifier, JSC::JSValue) +std::unique_ptr JSCryptoAlgorithmDictionary::createParametersForWrapKey(JSC::ExecState* exec, CryptoAlgorithmIdentifier algorithm, JSC::JSValue) { switch (algorithm) { case CryptoAlgorithmIdentifier::RSAES_PKCS1_v1_5: @@ -480,7 +479,7 @@ std::unique_ptr JSCryptoAlgorithmDictionary::createPa } } -std::unique_ptr JSCryptoAlgorithmDictionary::createParametersForUnwrapKey(JSC::ExecState* exec, CryptoAlgorithmIdentifier, JSC::JSValue) +std::unique_ptr JSCryptoAlgorithmDictionary::createParametersForUnwrapKey(JSC::ExecState* exec, CryptoAlgorithmIdentifier algorithm, JSC::JSValue) { switch (algorithm) { case CryptoAlgorithmIdentifier::RSAES_PKCS1_v1_5: diff --git a/Source/WebCore/crypto/CryptoAlgorithmRegistry.cpp b/Source/WebCore/crypto/CryptoAlgorithmRegistry.cpp index 880d902477331ef005badc0d38924ccc4e330d18..2934d71cff20521b92c6f22b19e19831e02b6209 100644 --- a/Source/WebCore/crypto/CryptoAlgorithmRegistry.cpp +++ b/Source/WebCore/crypto/CryptoAlgorithmRegistry.cpp @@ -47,6 +47,9 @@ CryptoAlgorithmRegistry::CryptoAlgorithmRegistry() bool CryptoAlgorithmRegistry::getIdentifierForName(const String& name, CryptoAlgorithmIdentifier& result) { + if (name.isEmpty()) + return false; + auto iter = m_nameToIdentifierMap.find(name.lower()); if (iter == m_nameToIdentifierMap.end()) return false; diff --git a/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA1.cpp b/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA1.cpp index 3eaae6de632f4b83ded63fdd9dd498082be6ec46..db0665be7e1e2b045557171f2c0aed9af625a051 100644 --- a/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA1.cpp +++ b/Source/WebCore/crypto/algorithms/CryptoAlgorithmSHA1.cpp @@ -42,7 +42,7 @@ CryptoAlgorithmSHA1::~CryptoAlgorithmSHA1() std::unique_ptr CryptoAlgorithmSHA1::create() { - return std::make_unique(); + return std::unique_ptr(new CryptoAlgorithmSHA1); } CryptoAlgorithmIdentifier CryptoAlgorithmSHA1::identifier() const diff --git a/Source/WebKit/mac/ChangeLog b/Source/WebKit/mac/ChangeLog index 280a90a98967f9bf0386955d962f3cce737903d9..e516775ffc85ed08650fee28d7838b9e8d5d7bd0 100644 --- a/Source/WebKit/mac/ChangeLog +++ b/Source/WebKit/mac/ChangeLog @@ -1,3 +1,12 @@ +2013-10-31 Alexey Proskuryakov + + Enable WebCrypto on Mac + https://bugs.webkit.org/show_bug.cgi?id=123587 + + Reviewed by Anders Carlsson. + + * Configurations/FeatureDefines.xcconfig: Do it. + 2013-10-30 Ryosuke Niwa Remove code for Mac Lion diff --git a/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig b/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig index 30c89a51d3512bfb739e531734b8b45cb93bfd19..1d2fabf8638c40a0183fdaf1d2380298c43bdc5e 100644 --- a/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig +++ b/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig @@ -155,7 +155,7 @@ ENABLE_SPEECH_SYNTHESIS = $(ENABLE_SPEECH_SYNTHESIS_$(PLATFORM_NAME)); ENABLE_SPEECH_SYNTHESIS_macosx = ENABLE_SPEECH_SYNTHESIS; ENABLE_SQL_DATABASE = ENABLE_SQL_DATABASE; ENABLE_SUBPIXEL_LAYOUT = ; -ENABLE_SUBTLE_CRYPTO = ; +ENABLE_SUBTLE_CRYPTO = ENABLE_SUBTLE_CRYPTO; ENABLE_SVG = ENABLE_SVG; ENABLE_SVG_FONTS = ENABLE_SVG_FONTS; ENABLE_TEMPLATE_ELEMENT = ; diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog index e419b4a209b8b676cdfaabd8cbd10d8f8ef69b54..4f017cbab812e2e93c87f9096e5cc439927ce8a2 100644 --- a/Source/WebKit2/ChangeLog +++ b/Source/WebKit2/ChangeLog @@ -1,3 +1,12 @@ +2013-10-31 Alexey Proskuryakov + + Enable WebCrypto on Mac + https://bugs.webkit.org/show_bug.cgi?id=123587 + + Reviewed by Anders Carlsson. + + * Configurations/FeatureDefines.xcconfig: Do it. + 2013-10-31 Sergio Correia [WK2] Convert SeccompFilters to using unique_ptr instead of OwnPtr/PassOwnPtr diff --git a/Source/WebKit2/Configurations/FeatureDefines.xcconfig b/Source/WebKit2/Configurations/FeatureDefines.xcconfig index 4c6681cf27a4160b9cce99c20c67156702c24d97..27ff1522256ce395e973edde8f71721f2c78a213 100644 --- a/Source/WebKit2/Configurations/FeatureDefines.xcconfig +++ b/Source/WebKit2/Configurations/FeatureDefines.xcconfig @@ -155,7 +155,7 @@ ENABLE_SPEECH_SYNTHESIS = $(ENABLE_SPEECH_SYNTHESIS_$(PLATFORM_NAME)); ENABLE_SPEECH_SYNTHESIS_macosx = ENABLE_SPEECH_SYNTHESIS; ENABLE_SQL_DATABASE = ENABLE_SQL_DATABASE; ENABLE_SUBPIXEL_LAYOUT = ; -ENABLE_SUBTLE_CRYPTO = ; +ENABLE_SUBTLE_CRYPTO = ENABLE_SUBTLE_CRYPTO; ENABLE_SVG = ENABLE_SVG; ENABLE_SVG_FONTS = ENABLE_SVG_FONTS; ENABLE_TEMPLATE_ELEMENT = ;