<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[164546] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/164546">164546</a></dd>
<dt>Author</dt> <dd>ap@apple.com</dd>
<dt>Date</dt> <dd>2014-02-22 10:10:37 -0800 (Sat, 22 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rename JWK key_ops values from wrap/unwrap to wrapKey/unwrapKey
https://bugs.webkit.org/show_bug.cgi?id=129121
Reviewed by Sam Weinig.
Source/WebCore:
* bindings/js/JSCryptoKeySerializationJWK.cpp:
(WebCore::JSCryptoKeySerializationJWK::reconcileUsages): Updated to newer names.
(WebCore::addUsagesToJSON): Ditto.
(WebCore::JSCryptoKeySerializationJWK::serialize): rsa-oaep-key-manipulation test
started ot fail, because RSA-OAEP with 2048 bit key and sha-1 can only encrypt
214 bytes, and the new longer names made JSON serialization slightly longer.
Compensate by not doing any indentation in JSON.
LayoutTests:
* crypto/subtle/aes-export-key-expected.txt:
* crypto/subtle/aes-export-key.html:
* crypto/subtle/jwk-export-use-values-expected.txt:
* crypto/subtle/jwk-export-use-values.html:
* crypto/subtle/jwk-import-use-values-expected.txt:
* crypto/subtle/jwk-import-use-values.html:
* crypto/subtle/rsa-oaep-key-manipulation-expected.txt:
* crypto/subtle/rsa-oaep-key-manipulation.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestscryptosubtleaesexportkeyexpectedtxt">trunk/LayoutTests/crypto/subtle/aes-export-key-expected.txt</a></li>
<li><a href="#trunkLayoutTestscryptosubtleaesexportkeyhtml">trunk/LayoutTests/crypto/subtle/aes-export-key.html</a></li>
<li><a href="#trunkLayoutTestscryptosubtlejwkexportusevaluesexpectedtxt">trunk/LayoutTests/crypto/subtle/jwk-export-use-values-expected.txt</a></li>
<li><a href="#trunkLayoutTestscryptosubtlejwkexportusevalueshtml">trunk/LayoutTests/crypto/subtle/jwk-export-use-values.html</a></li>
<li><a href="#trunkLayoutTestscryptosubtlejwkimportusevaluesexpectedtxt">trunk/LayoutTests/crypto/subtle/jwk-import-use-values-expected.txt</a></li>
<li><a href="#trunkLayoutTestscryptosubtlejwkimportusevalueshtml">trunk/LayoutTests/crypto/subtle/jwk-import-use-values.html</a></li>
<li><a href="#trunkLayoutTestscryptosubtlersaoaepkeymanipulationexpectedtxt">trunk/LayoutTests/crypto/subtle/rsa-oaep-key-manipulation-expected.txt</a></li>
<li><a href="#trunkLayoutTestscryptosubtlersaoaepkeymanipulationhtml">trunk/LayoutTests/crypto/subtle/rsa-oaep-key-manipulation.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSCryptoKeySerializationJWKcpp">trunk/Source/WebCore/bindings/js/JSCryptoKeySerializationJWK.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (164545 => 164546)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-02-22 17:50:55 UTC (rev 164545)
+++ trunk/LayoutTests/ChangeLog 2014-02-22 18:10:37 UTC (rev 164546)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-02-22 Alexey Proskuryakov <ap@apple.com>
+
+ Rename JWK key_ops values from wrap/unwrap to wrapKey/unwrapKey
+ https://bugs.webkit.org/show_bug.cgi?id=129121
+
+ Reviewed by Sam Weinig.
+
+ * crypto/subtle/aes-export-key-expected.txt:
+ * crypto/subtle/aes-export-key.html:
+ * crypto/subtle/jwk-export-use-values-expected.txt:
+ * crypto/subtle/jwk-export-use-values.html:
+ * crypto/subtle/jwk-import-use-values-expected.txt:
+ * crypto/subtle/jwk-import-use-values.html:
+ * crypto/subtle/rsa-oaep-key-manipulation-expected.txt:
+ * crypto/subtle/rsa-oaep-key-manipulation.html:
+
</ins><span class="cx"> 2014-02-21 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><span class="cx"> Add inspection user interface for IndexedDB.
</span></span></pre></div>
<a id="trunkLayoutTestscryptosubtleaesexportkeyexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/crypto/subtle/aes-export-key-expected.txt (164545 => 164546)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/aes-export-key-expected.txt 2014-02-22 17:50:55 UTC (rev 164545)
+++ trunk/LayoutTests/crypto/subtle/aes-export-key-expected.txt 2014-02-22 18:10:37 UTC (rev 164546)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> PASS exportedJWK.alg is 'A192CBC'
</span><span class="cx"> PASS exportedJWK.ext is true
</span><span class="cx"> PASS exportedJWK.use is undefined
</span><del>-PASS exportedJWK.key_ops is ['encrypt', 'decrypt', 'wrap', 'unwrap']
</del><ins>+PASS exportedJWK.key_ops is ['encrypt', 'decrypt', 'wrapKey', 'unwrapKey']
</ins><span class="cx">
</span><span class="cx"> Importing a key that's not extractable...
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestscryptosubtleaesexportkeyhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/crypto/subtle/aes-export-key.html (164545 => 164546)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/aes-export-key.html 2014-02-22 17:50:55 UTC (rev 164545)
+++ trunk/LayoutTests/crypto/subtle/aes-export-key.html 2014-02-22 18:10:37 UTC (rev 164546)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> shouldBe("exportedJWK.alg", "'A192CBC'");
</span><span class="cx"> shouldBe("exportedJWK.ext", "true");
</span><span class="cx"> shouldBe("exportedJWK.use", "undefined");
</span><del>- shouldBe("exportedJWK.key_ops", "['encrypt', 'decrypt', 'wrap', 'unwrap']");
</del><ins>+ shouldBe("exportedJWK.key_ops", "['encrypt', 'decrypt', 'wrapKey', 'unwrapKey']");
</ins><span class="cx">
</span><span class="cx"> debug("\nImporting a key that's not extractable...");
</span><span class="cx"> return crypto.subtle.importKey("jwk", jwkKeyAsArrayBuffer, "AES-CBC", nonExtractable, ['encrypt', 'decrypt', 'wrapKey', 'unwrapKey'])
</span></span></pre></div>
<a id="trunkLayoutTestscryptosubtlejwkexportusevaluesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/crypto/subtle/jwk-export-use-values-expected.txt (164545 => 164546)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/jwk-export-use-values-expected.txt 2014-02-22 17:50:55 UTC (rev 164545)
+++ trunk/LayoutTests/crypto/subtle/jwk-export-use-values-expected.txt 2014-02-22 18:10:37 UTC (rev 164546)
</span><span class="lines">@@ -17,23 +17,23 @@
</span><span class="cx">
</span><span class="cx"> wrapKey:
</span><span class="cx"> PASS jwk.use is undefined
</span><del>-PASS jwk.key_ops is ["wrap"]
</del><ins>+PASS jwk.key_ops is ["wrapKey"]
</ins><span class="cx">
</span><span class="cx"> unwrapKey:
</span><span class="cx"> PASS jwk.use is undefined
</span><del>-PASS jwk.key_ops is ["unwrap"]
</del><ins>+PASS jwk.key_ops is ["unwrapKey"]
</ins><span class="cx">
</span><span class="cx"> wrapKey,unwrapKey:
</span><span class="cx"> PASS jwk.use is undefined
</span><del>-PASS jwk.key_ops is ["wrap","unwrap"]
</del><ins>+PASS jwk.key_ops is ["wrapKey","unwrapKey"]
</ins><span class="cx">
</span><span class="cx"> encrypt,decrypt,wrapKey:
</span><span class="cx"> PASS jwk.use is undefined
</span><del>-PASS jwk.key_ops is ["encrypt","decrypt","wrap"]
</del><ins>+PASS jwk.key_ops is ["encrypt","decrypt","wrapKey"]
</ins><span class="cx">
</span><span class="cx"> encrypt,decrypt,wrapKey,unwrapKey:
</span><span class="cx"> PASS jwk.use is undefined
</span><del>-PASS jwk.key_ops is ["encrypt","decrypt","wrap","unwrap"]
</del><ins>+PASS jwk.key_ops is ["encrypt","decrypt","wrapKey","unwrapKey"]
</ins><span class="cx">
</span><span class="cx"> sign:
</span><span class="cx"> PASS jwk.use is undefined
</span></span></pre></div>
<a id="trunkLayoutTestscryptosubtlejwkexportusevalueshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/crypto/subtle/jwk-export-use-values.html (164545 => 164546)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/jwk-export-use-values.html 2014-02-22 17:50:55 UTC (rev 164545)
+++ trunk/LayoutTests/crypto/subtle/jwk-export-use-values.html 2014-02-22 18:10:37 UTC (rev 164546)
</span><span class="lines">@@ -48,11 +48,11 @@
</span><span class="cx"> testWithAESCBC(["encrypt"], ["encrypt"]),
</span><span class="cx"> testWithAESCBC(["decrypt"], ["decrypt"]),
</span><span class="cx"> testWithAESCBC(["encrypt", "decrypt"], ["encrypt", "decrypt"]),
</span><del>- testWithAESCBC(["wrapKey"], ["wrap"]),
- testWithAESCBC(["unwrapKey"], ["unwrap"]),
- testWithAESCBC(["wrapKey", "unwrapKey"], ["wrap", "unwrap"]),
- testWithAESCBC(["encrypt", "decrypt", "wrapKey"], ["encrypt", "decrypt", "wrap"]),
- testWithAESCBC(["encrypt", "decrypt", "wrapKey", "unwrapKey"], ["encrypt", "decrypt", "wrap", "unwrap"]),
</del><ins>+ testWithAESCBC(["wrapKey"], ["wrapKey"]),
+ testWithAESCBC(["unwrapKey"], ["unwrapKey"]),
+ testWithAESCBC(["wrapKey", "unwrapKey"], ["wrapKey", "unwrapKey"]),
+ testWithAESCBC(["encrypt", "decrypt", "wrapKey"], ["encrypt", "decrypt", "wrapKey"]),
+ testWithAESCBC(["encrypt", "decrypt", "wrapKey", "unwrapKey"], ["encrypt", "decrypt", "wrapKey", "unwrapKey"]),
</ins><span class="cx"> testWithHMAC(["sign"], ["sign"]),
</span><span class="cx"> testWithHMAC(["verify"], ["verify"]),
</span><span class="cx"> testWithHMAC(["sign", "verify"], ["sign", "verify"]),
</span></span></pre></div>
<a id="trunkLayoutTestscryptosubtlejwkimportusevaluesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/crypto/subtle/jwk-import-use-values-expected.txt (164545 => 164546)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/jwk-import-use-values-expected.txt 2014-02-22 17:50:55 UTC (rev 164545)
+++ trunk/LayoutTests/crypto/subtle/jwk-import-use-values-expected.txt 2014-02-22 18:10:37 UTC (rev 164546)
</span><span class="lines">@@ -14,16 +14,16 @@
</span><span class="cx"> {"key_ops":["encrypt","decrypt"]}:
</span><span class="cx"> PASS key.usages is ["decrypt","encrypt"]
</span><span class="cx">
</span><del>-{"key_ops":["wrap"]}:
</del><ins>+{"key_ops":["wrapKey"]}:
</ins><span class="cx"> PASS key.usages is ["wrapKey"]
</span><span class="cx">
</span><del>-{"key_ops":["unwrap"]}:
</del><ins>+{"key_ops":["unwrapKey"]}:
</ins><span class="cx"> PASS key.usages is ["unwrapKey"]
</span><span class="cx">
</span><del>-{"key_ops":["wrap","unwrap"]}:
</del><ins>+{"key_ops":["wrapKey","unwrapKey"]}:
</ins><span class="cx"> PASS key.usages is ["unwrapKey","wrapKey"]
</span><span class="cx">
</span><del>-{"key_ops":["encrypt","decrypt","wrap"]}:
</del><ins>+{"key_ops":["encrypt","decrypt","wrapKey"]}:
</ins><span class="cx"> PASS key.usages is ["decrypt","encrypt","wrapKey"]
</span><span class="cx">
</span><span class="cx"> {"use":"enc"}:
</span></span></pre></div>
<a id="trunkLayoutTestscryptosubtlejwkimportusevalueshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/crypto/subtle/jwk-import-use-values.html (164545 => 164546)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/jwk-import-use-values.html 2014-02-22 17:50:55 UTC (rev 164545)
+++ trunk/LayoutTests/crypto/subtle/jwk-import-use-values.html 2014-02-22 18:10:37 UTC (rev 164546)
</span><span class="lines">@@ -73,10 +73,10 @@
</span><span class="cx"> testWithAESCBC(["encrypt"], {key_ops: ["encrypt"]}),
</span><span class="cx"> testWithAESCBC(["decrypt"], {key_ops: ["decrypt"]}),
</span><span class="cx"> testWithAESCBC(["decrypt", "encrypt"], {key_ops: ["encrypt", "decrypt"]}),
</span><del>- testWithAESCBC(["wrapKey"], {key_ops: ["wrap"]}),
- testWithAESCBC(["unwrapKey"], {key_ops: ["unwrap"]}),
- testWithAESCBC(["unwrapKey", "wrapKey"], {key_ops: ["wrap", "unwrap"]}),
- testWithAESCBC(["decrypt", "encrypt", "wrapKey"], {key_ops: ["encrypt", "decrypt", "wrap"]}),
</del><ins>+ testWithAESCBC(["wrapKey"], {key_ops: ["wrapKey"]}),
+ testWithAESCBC(["unwrapKey"], {key_ops: ["unwrapKey"]}),
+ testWithAESCBC(["unwrapKey", "wrapKey"], {key_ops: ["wrapKey", "unwrapKey"]}),
+ testWithAESCBC(["decrypt", "encrypt", "wrapKey"], {key_ops: ["encrypt", "decrypt", "wrapKey"]}),
</ins><span class="cx"> testWithAESCBC(["decrypt", "encrypt", "unwrapKey", "wrapKey"], {use: "enc"}),
</span><span class="cx"> testWithHMAC(["sign"], {key_ops: ["sign"]}),
</span><span class="cx"> testWithHMAC(["verify"], {key_ops: ["verify"]}),
</span></span></pre></div>
<a id="trunkLayoutTestscryptosubtlersaoaepkeymanipulationexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/crypto/subtle/rsa-oaep-key-manipulation-expected.txt (164545 => 164546)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/rsa-oaep-key-manipulation-expected.txt 2014-02-22 17:50:55 UTC (rev 164545)
+++ trunk/LayoutTests/crypto/subtle/rsa-oaep-key-manipulation-expected.txt 2014-02-22 18:10:37 UTC (rev 164546)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> Exporting public key to JWK...
</span><span class="cx"> PASS jwkPublicKey.alg is 'RSA-OAEP'
</span><span class="cx"> PASS jwkPublicKey.ext is true
</span><del>-PASS jwkPublicKey.key_ops is ['encrypt', 'decrypt', 'wrap', 'unwrap']
</del><ins>+PASS jwkPublicKey.key_ops is ['encrypt', 'decrypt', 'wrapKey', 'unwrapKey']
</ins><span class="cx"> PASS jwkPublicKey.use is undefined
</span><span class="cx"> PASS jwkPublicKey.kty is 'RSA'
</span><span class="cx"> PASS bytesToHexString(Base64URL.parse(jwkPublicKey.e)) is '010001'
</span></span></pre></div>
<a id="trunkLayoutTestscryptosubtlersaoaepkeymanipulationhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/crypto/subtle/rsa-oaep-key-manipulation.html (164545 => 164546)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/rsa-oaep-key-manipulation.html 2014-02-22 17:50:55 UTC (rev 164545)
+++ trunk/LayoutTests/crypto/subtle/rsa-oaep-key-manipulation.html 2014-02-22 18:10:37 UTC (rev 164546)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> jwkPublicKey = JSON.parse(bytesToASCIIString(jwkPublicKeyArray));
</span><span class="cx"> shouldBe("jwkPublicKey.alg", "'RSA-OAEP'");
</span><span class="cx"> shouldBe("jwkPublicKey.ext", "true");
</span><del>- shouldBe("jwkPublicKey.key_ops", "['encrypt', 'decrypt', 'wrap', 'unwrap']");
</del><ins>+ shouldBe("jwkPublicKey.key_ops", "['encrypt', 'decrypt', 'wrapKey', 'unwrapKey']");
</ins><span class="cx"> shouldBe("jwkPublicKey.use", "undefined");
</span><span class="cx"> shouldBe("jwkPublicKey.kty", "'RSA'");
</span><span class="cx"> shouldBe("bytesToHexString(Base64URL.parse(jwkPublicKey.e))", "'010001'");
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (164545 => 164546)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-22 17:50:55 UTC (rev 164545)
+++ trunk/Source/WebCore/ChangeLog 2014-02-22 18:10:37 UTC (rev 164546)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-02-22 Alexey Proskuryakov <ap@apple.com>
+
+ Rename JWK key_ops values from wrap/unwrap to wrapKey/unwrapKey
+ https://bugs.webkit.org/show_bug.cgi?id=129121
+
+ Reviewed by Sam Weinig.
+
+ * bindings/js/JSCryptoKeySerializationJWK.cpp:
+ (WebCore::JSCryptoKeySerializationJWK::reconcileUsages): Updated to newer names.
+ (WebCore::addUsagesToJSON): Ditto.
+ (WebCore::JSCryptoKeySerializationJWK::serialize): rsa-oaep-key-manipulation test
+ started ot fail, because RSA-OAEP with 2048 bit key and sha-1 can only encrypt
+ 214 bytes, and the new longer names made JSON serialization slightly longer.
+ Compensate by not doing any indentation in JSON.
+
</ins><span class="cx"> 2014-02-22 Frédéric Wang <fred.wang@free.fr>
</span><span class="cx">
</span><span class="cx"> Only skip stretchy operators when determining the stretch height.
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSCryptoKeySerializationJWKcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSCryptoKeySerializationJWK.cpp (164545 => 164546)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSCryptoKeySerializationJWK.cpp 2014-02-22 17:50:55 UTC (rev 164545)
+++ trunk/Source/WebCore/bindings/js/JSCryptoKeySerializationJWK.cpp 2014-02-22 18:10:37 UTC (rev 164546)
</span><span class="lines">@@ -282,9 +282,9 @@
</span><span class="cx"> return;
</span><span class="cx"> if (!tryJWKKeyOpsValue(m_exec, jwkUsages, operation, ASCIILiteral("decrypt"), CryptoKeyUsageDecrypt))
</span><span class="cx"> return;
</span><del>- if (!tryJWKKeyOpsValue(m_exec, jwkUsages, operation, ASCIILiteral("wrap"), CryptoKeyUsageWrapKey))
</del><ins>+ if (!tryJWKKeyOpsValue(m_exec, jwkUsages, operation, ASCIILiteral("wrapKey"), CryptoKeyUsageWrapKey))
</ins><span class="cx"> return;
</span><del>- if (!tryJWKKeyOpsValue(m_exec, jwkUsages, operation, ASCIILiteral("unwrap"), CryptoKeyUsageUnwrapKey))
</del><ins>+ if (!tryJWKKeyOpsValue(m_exec, jwkUsages, operation, ASCIILiteral("unwrapKey"), CryptoKeyUsageUnwrapKey))
</ins><span class="cx"> return;
</span><span class="cx"> if (!tryJWKKeyOpsValue(m_exec, jwkUsages, operation, ASCIILiteral("deriveKey"), CryptoKeyUsageDeriveKey))
</span><span class="cx"> return;
</span><span class="lines">@@ -666,9 +666,9 @@
</span><span class="cx"> if (usages & CryptoKeyUsageDecrypt)
</span><span class="cx"> keyOps->putDirectIndex(exec, index++, jsString(exec, ASCIILiteral("decrypt")));
</span><span class="cx"> if (usages & CryptoKeyUsageWrapKey)
</span><del>- keyOps->putDirectIndex(exec, index++, jsString(exec, ASCIILiteral("wrap")));
</del><ins>+ keyOps->putDirectIndex(exec, index++, jsString(exec, ASCIILiteral("wrapKey")));
</ins><span class="cx"> if (usages & CryptoKeyUsageUnwrapKey)
</span><del>- keyOps->putDirectIndex(exec, index++, jsString(exec, ASCIILiteral("unwrap")));
</del><ins>+ keyOps->putDirectIndex(exec, index++, jsString(exec, ASCIILiteral("unwrapKey")));
</ins><span class="cx"> if (usages & CryptoKeyUsageDeriveKey)
</span><span class="cx"> keyOps->putDirectIndex(exec, index++, jsString(exec, ASCIILiteral("deriveKey")));
</span><span class="cx"> if (usages & CryptoKeyUsageDeriveBits)
</span><span class="lines">@@ -709,7 +709,7 @@
</span><span class="cx"> if (exec->hadException())
</span><span class="cx"> return String();
</span><span class="cx">
</span><del>- return JSONStringify(exec, result, 4);
</del><ins>+ return JSONStringify(exec, result, 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre>
</div>
</div>
</body>
</html>