Modified: trunk/Source/WebCore/ChangeLog (218665 => 218666)
--- trunk/Source/WebCore/ChangeLog 2017-06-22 00:27:51 UTC (rev 218665)
+++ trunk/Source/WebCore/ChangeLog 2017-06-22 00:40:58 UTC (rev 218666)
@@ -1,3 +1,19 @@
+2017-06-21 Jiewen Tan <[email protected]>
+
+ [WebCrypto] Restore ordering of CryptoAlgorithmIdentifier in SerializedScriptValue
+ https://bugs.webkit.org/show_bug.cgi?id=173678
+ <rdar://problem/32879314>
+
+ Reviewed by Sam Weinig.
+
+ r218030 reorders the ordering of CryptoAlgorithmIdentifier in SerializedScriptValue,
+ which introduces backward compatibility issues with CryptoKey objects stored in the
+ IndexedDB. Hence, we should restore it back.
+
+ No tests.
+
+ * bindings/js/SerializedScriptValue.cpp:
+
2017-06-21 Daniel Bates <[email protected]>
Change FrameLoadRequest from a struct to a class
Modified: trunk/Source/WebCore/bindings/js/SerializedScriptValue.cpp (218665 => 218666)
--- trunk/Source/WebCore/bindings/js/SerializedScriptValue.cpp 2017-06-22 00:27:51 UTC (rev 218665)
+++ trunk/Source/WebCore/bindings/js/SerializedScriptValue.cpp 2017-06-22 00:40:58 UTC (rev 218666)
@@ -242,17 +242,17 @@
ECDH = 5,
AES_CTR = 6,
AES_CBC = 7,
- AES_GCM = 8,
- AES_CFB = 9,
- AES_KW = 10,
- HMAC = 11,
- SHA_1 = 12,
- SHA_224 = 13,
- SHA_256 = 14,
- SHA_384 = 15,
- SHA_512 = 16,
- HKDF = 17,
- PBKDF2 = 18,
+ AES_GCM = 9,
+ AES_CFB = 10,
+ AES_KW = 11,
+ HMAC = 12,
+ SHA_1 = 14,
+ SHA_224 = 15,
+ SHA_256 = 16,
+ SHA_384 = 17,
+ SHA_512 = 18,
+ HKDF = 20,
+ PBKDF2 = 21,
};
const uint8_t cryptoAlgorithmIdentifierTagMaximumValue = 21;