<!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>[172898] 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/172898">172898</a></dd>
<dt>Author</dt> <dd>ap@apple.com</dd>
<dt>Date</dt> <dd>2014-08-24 19:33:07 -0700 (Sun, 24 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>ASSERT(extractable()) when storing a non-extractable key in IndexedDB
https://bugs.webkit.org/show_bug.cgi?id=136202
rdar://problem/17993967
Reviewed by Darin Adler.
Source/WebCore:
Test: crypto/subtle/rsa-indexeddb-non-exportable.html
Removed the obsolete assertion.
* crypto/keys/CryptoKeyAES.cpp: (WebCore::CryptoKeyAES::exportData):
* crypto/keys/CryptoKeyHMAC.cpp: (WebCore::CryptoKeyHMAC::exportData):
* crypto/mac/CryptoKeyRSAMac.cpp: (WebCore::CryptoKeyRSA::exportData):
LayoutTests:
* crypto/subtle/rsa-indexeddb-non-exportable-expected.txt: Added.
* crypto/subtle/rsa-indexeddb-non-exportable.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecryptokeysCryptoKeyAEScpp">trunk/Source/WebCore/crypto/keys/CryptoKeyAES.cpp</a></li>
<li><a href="#trunkSourceWebCorecryptokeysCryptoKeyHMACcpp">trunk/Source/WebCore/crypto/keys/CryptoKeyHMAC.cpp</a></li>
<li><a href="#trunkSourceWebCorecryptomacCryptoKeyRSAMaccpp">trunk/Source/WebCore/crypto/mac/CryptoKeyRSAMac.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestscryptosubtlersaindexeddbnonexportableexpectedtxt">trunk/LayoutTests/crypto/subtle/rsa-indexeddb-non-exportable-expected.txt</a></li>
<li><a href="#trunkLayoutTestscryptosubtlersaindexeddbnonexportablehtml">trunk/LayoutTests/crypto/subtle/rsa-indexeddb-non-exportable.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (172897 => 172898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-08-25 00:26:14 UTC (rev 172897)
+++ trunk/LayoutTests/ChangeLog 2014-08-25 02:33:07 UTC (rev 172898)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-08-24 Alexey Proskuryakov <ap@apple.com>
+
+ ASSERT(extractable()) when storing a non-extractable key in IndexedDB
+ https://bugs.webkit.org/show_bug.cgi?id=136202
+ rdar://problem/17993967
+
+ Reviewed by Darin Adler.
+
+ * crypto/subtle/rsa-indexeddb-non-exportable-expected.txt: Added.
+ * crypto/subtle/rsa-indexeddb-non-exportable.html: Added.
+
</ins><span class="cx"> 2014-08-22 Zoltan Horvath <zoltan@webkit.org>
</span><span class="cx">
</span><span class="cx"> [EFL][WK2] Remove fast/css3-text/css3-text-align-last/text-align-last-with-text-align-justify.html from skipped list
</span></span></pre></div>
<a id="trunkLayoutTestscryptosubtlersaindexeddbnonexportableexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/crypto/subtle/rsa-indexeddb-non-exportable-expected.txt (0 => 172898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/rsa-indexeddb-non-exportable-expected.txt (rev 0)
+++ trunk/LayoutTests/crypto/subtle/rsa-indexeddb-non-exportable-expected.txt 2014-08-25 02:33:07 UTC (rev 172898)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+Test storing a private RSA key in IndexedDB, and retrieving it.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS retrievedKey.type is 'private'
+PASS retrievedKey.extractable is false
+PASS retrievedKey.algorithm.name is 'RSASSA-PKCS1-v1_5'
+PASS retrievedKey.algorithm.modulusLength is 2048
+PASS bytesToHexString(retrievedKey.algorithm.publicExponent) is '010001'
+PASS retrievedKey.usages is ["sign", "verify"]
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestscryptosubtlersaindexeddbnonexportablehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/crypto/subtle/rsa-indexeddb-non-exportable.html (0 => 172898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/rsa-indexeddb-non-exportable.html (rev 0)
+++ trunk/LayoutTests/crypto/subtle/rsa-indexeddb-non-exportable.html 2014-08-25 02:33:07 UTC (rev 172898)
</span><span class="lines">@@ -0,0 +1,74 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+<script src="resources/common.js"></script>
+</head>
+<body>
+<script>
+
+description("Test storing a private RSA key in IndexedDB, and retrieving it.");
+
+jsTestIsAsync = true;
+
+var privateKeyJSON = {
+ kty: "RSA",
+ alg: "RS256",
+ n: "rcCUCv7Oc1HVam1DIhCzqknThWawOp8QLk8Ziy2p10ByjQFCajoFiyuAWl-R1WXZaf4xitLRracT9agpzIzc-MbLSHIGgWQGO21lGiImy5ftZ-D8bHAqRz2y15pzD4c4CEou7XSSLDoRnR0QG5MsDhD6s2gV9mwHkrtkCxtMWdBi-77as8wGmlNRldcOSgZDLK8UnCSgA1OguZ989bFyc8tOOEIb0xUSfPSz3LPSCnyYz68aDjmKVeNH-ig857OScyWbGyEy3Biw64qun3juUlNWsJ3zngkOdteYWytx5Qr4XKNs6R-Myyq72KUp02mJDZiiyiglxML_i3-_CeecCw",
+ e: "AQAB",
+ d: "eNLS37aCz7RXSNPD_DtLBJ6j5T8cSxdzRBCjPaI6WcGqJp16lq3UTwuoDLAqlA9oGYm238dsIWpuucP_lQtbWe-7SpxoI6_vmYGf7YVUHv1-DF9qiOmSrMmdxMnVOzYXY8RaT6thPjn_J5cfLV2xI_LwsrMtmpdSyNlgX0zTUhwtuahgAKMEChYjH2EnjHdHw6sY2-wApdcQI7ULE0oo5RzbQZpmuhcN9hiBc0L3hhF0qo50mbl02_65_GQ7DpVkXBxNgRBLzlPabmzzG2oAhfefLgYmSC1opaCkXE6vRWQNWNL45RZNZFYM3uoJghOMqGeocM0BpjdChHrPOlFvSQ",
+ p: "4miTuAjKMeH5uJ5KB397QUwhbkYEgSbcA2mifmSkvE2018gb55qkBHK1eVryf1_m43LNlc6O_ak6gfzdZIZvS5NCGjPl0q09plUpu8qFOSspBwA67qGH76lFlZLn_d4yglS7wfLru4_5Ys8qLLs-DqVLviwposOnyyWqwM5AXp0",
+ q: "xHYrzkivtmnz_sGchnWGc0q-pDOkKicptRpv2pMFIIXxnFX5aMeEXIZjVujXtwUy1UlFIN2GZJSvy5KJ79mu_XyNnFHMzedH-A3ee3u8h1UUrZF-vUu1_e4U_x67NN1dedzUSKynN7pFl3OkuShMBWGV-cwzOPdcVAfVuZlxUMc",
+ dp: "fBzDzYDUBmBQGop7Hn0dvf_T27V6RqpctWo074CQZcFbP2atFVtKSj3viWT3xid2VHzcgiDHdfpM3nEVlEO1wwIonGCSvdjGEOZiiFVOjrZAOVxA8guOjyyFvqbXke06VwPIIVvfKeSU2zuhbP__1tt6F_fxow4Kb2xonGT0GGk",
+ dq: "jmE2DiIPdhwDgLXAQpIaBqQ81bO3XfVT_LRULAwwwwlPuQV148H04zlh9TJ6Y2GZHYokV1U0eOBpJxfkb7dLYtpJpuiBjRf4yIUEoGlkkI_QlJnFSFr-YjGRdfNHqWBkxlSMZL770R9mIATndGkH7z5x-r9KwBZFC4FCG2hg_zE",
+ qi: "YCX_pLwbMBA1ThVH0WcwmnytqNcrMCEwTm7ByA2eU6nWbQrULvf7m9_kzfLUcjsnpAVlBQG5JMXMy0Sq4ptwbywsa5-G8KAOOOR2L3v4hC-Eys9ftgFM_3i0o40eeQH4b3haPbntrIeMg8IzlOuVYKf9-2QuKDoWeRdd7NsdxTk"
+};
+
+crypto.subtle.importKey("jwk", asciiToUint8Array(JSON.stringify(privateKeyJSON)), null, false, ["sign", "verify"]).then(function(key) {
+ var openRequest = indexedDB.open("crypto_subtle");
+ openRequest.onupgradeneeded = function(event) {
+ var objectStore = event.target.result.createObjectStore("rsa-indexeddb");
+ }
+ openRequest.onerror = function(event) {
+ testFailed("Could not open database: " + event.target.error.name);
+ finishJSTest();
+ }
+ openRequest.onsuccess = function(event) {
+ db = event.target.result;
+ storeKey();
+ }
+
+ function storeKey() {
+ var objectStore = db.transaction("rsa-indexeddb", "readwrite").objectStore("rsa-indexeddb");
+ var req = objectStore.put(key, "mykey");
+ req.onerror = function(event) {
+ testFailed("Could not put a key into database: " + event.target.error.name);
+ finishJSTest();
+ }
+ req.onsuccess = function(event) { readKey(); }
+ }
+
+ function readKey() {
+ var objectStore = db.transaction("rsa-indexeddb").objectStore("rsa-indexeddb");
+ var req = objectStore.get("mykey");
+ req.onerror = function(event) {
+ testFailed("Could not get a key from database: " + event.target.error.name);
+ finishJSTest();
+ }
+ req.onsuccess = function(event) {
+ window.retrievedKey = event.target.result;
+ shouldBe("retrievedKey.type", "'private'");
+ shouldBe("retrievedKey.extractable", "false");
+ shouldBe("retrievedKey.algorithm.name", "'RSASSA-PKCS1-v1_5'");
+ shouldBe("retrievedKey.algorithm.modulusLength", "2048");
+ shouldBe("bytesToHexString(retrievedKey.algorithm.publicExponent)", "'010001'");
+ shouldBe("retrievedKey.usages", '["sign", "verify"]');
+
+ finishJSTest();
+ }
+ }
+});
+</script>
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (172897 => 172898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-08-25 00:26:14 UTC (rev 172897)
+++ trunk/Source/WebCore/ChangeLog 2014-08-25 02:33:07 UTC (rev 172898)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-08-24 Alexey Proskuryakov <ap@apple.com>
+
+ ASSERT(extractable()) when storing a non-extractable key in IndexedDB
+ https://bugs.webkit.org/show_bug.cgi?id=136202
+ rdar://problem/17993967
+
+ Reviewed by Darin Adler.
+
+ Test: crypto/subtle/rsa-indexeddb-non-exportable.html
+
+ Removed the obsolete assertion.
+
+ * crypto/keys/CryptoKeyAES.cpp: (WebCore::CryptoKeyAES::exportData):
+ * crypto/keys/CryptoKeyHMAC.cpp: (WebCore::CryptoKeyHMAC::exportData):
+ * crypto/mac/CryptoKeyRSAMac.cpp: (WebCore::CryptoKeyRSA::exportData):
+
</ins><span class="cx"> 2014-08-24 Brian J. Burg <burg@cs.washington.edu>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Rename DOM.RGBA and remove workarounds in the bindings generator
</span></span></pre></div>
<a id="trunkSourceWebCorecryptokeysCryptoKeyAEScpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/crypto/keys/CryptoKeyAES.cpp (172897 => 172898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/crypto/keys/CryptoKeyAES.cpp 2014-08-25 00:26:14 UTC (rev 172897)
+++ trunk/Source/WebCore/crypto/keys/CryptoKeyAES.cpp 2014-08-25 02:33:07 UTC (rev 172898)
</span><span class="lines">@@ -71,7 +71,6 @@
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<CryptoKeyData> CryptoKeyAES::exportData() const
</span><span class="cx"> {
</span><del>- ASSERT(extractable());
</del><span class="cx"> return CryptoKeyDataOctetSequence::create(m_key);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecryptokeysCryptoKeyHMACcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/crypto/keys/CryptoKeyHMAC.cpp (172897 => 172898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/crypto/keys/CryptoKeyHMAC.cpp 2014-08-25 00:26:14 UTC (rev 172897)
+++ trunk/Source/WebCore/crypto/keys/CryptoKeyHMAC.cpp 2014-08-25 02:33:07 UTC (rev 172898)
</span><span class="lines">@@ -80,7 +80,6 @@
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<CryptoKeyData> CryptoKeyHMAC::exportData() const
</span><span class="cx"> {
</span><del>- ASSERT(extractable());
</del><span class="cx"> return CryptoKeyDataOctetSequence::create(m_key);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecryptomacCryptoKeyRSAMaccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/crypto/mac/CryptoKeyRSAMac.cpp (172897 => 172898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/crypto/mac/CryptoKeyRSAMac.cpp 2014-08-25 00:26:14 UTC (rev 172897)
+++ trunk/Source/WebCore/crypto/mac/CryptoKeyRSAMac.cpp 2014-08-25 02:33:07 UTC (rev 172898)
</span><span class="lines">@@ -188,8 +188,6 @@
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<CryptoKeyData> CryptoKeyRSA::exportData() const
</span><span class="cx"> {
</span><del>- ASSERT(extractable());
-
</del><span class="cx"> switch (CCRSAGetKeyType(m_platformKey)) {
</span><span class="cx"> case ccRSAKeyPublic: {
</span><span class="cx"> Vector<uint8_t> modulus;
</span></span></pre>
</div>
</div>
</body>
</html>