--- a/spec/Overview-WebCryptoAPI.xml Mon Jul 01 12:26:26 2013 -0700
+++ b/spec/Overview-WebCryptoAPI.xml Wed Jul 03 16:18:01 2013 -0700
@@ -695,7 +695,7 @@
readonly attribute KeyType <a href="#dfn-Key-type">type</a>;
readonly attribute bool <a href="#dfn-Key-extractable">extractable</a>;
readonly attribute <a href="#dfn-Algorithm">Algorithm</a> <a href="#dfn-Key-algorithm">algorithm</a>;
- readonly attribute <a href="#dfn-KeyUsage">KeyUsage</a>[] <a href="#dfn-Key-keyUsage">keyUsage</a>;
+ readonly attribute <a href="#dfn-KeyUsage">KeyUsage</a>[] <a href="#dfn-Key-usages">usages</a>;
};
</x:codeblock>
<div id="key-interface-description" class="section">
@@ -736,7 +736,7 @@
<dd>
The <a href="#dfn-Algorithm"><code>Algorithm</code></a> used to generate the key.
</dd>
- <dt id="dfn-Key-keyUsage"><code>keyUsage</code></dt>
+ <dt id="dfn-Key-usages"><code>usages</code></dt>
<dd>
An <code>Array</code> of <a href="#dfn-KeyUsage"><code>KeyUsages</code></a> that
indicate what <a href="#dfn-CryptoOperation">CryptoOperations</a> may be used with this
@@ -767,7 +767,7 @@
<li><a href="#dfn-Key-type">type</a></li>
<li><a href="#dfn-Key-extractable">extractable</a></li>
<li><a href="#dfn-Key-algorithm">Algorithm</a></li>
- <li><a href="#dfn-Key-keyUsage">KeyUsage</a></li>
+ <li><a href="#dfn-Key-usages">KeyUsage</a></li>
</ul>
</li>
<li>
@@ -1830,7 +1830,7 @@
</li>
<li>
<p>
- If <var>baseKey</var>.<a href="#dfn-Key-keyUsage"><code>keyUsage</code></a> does not
+ If <var>baseKey</var>.<a href="#dfn-Key-usages"><code>usages</code></a> does not
contain the <code>"derive"</code> <a href="#dfn-KeyUsage"><code>KeyUsage</code></a>,
terminate this algorithm with an error.
</p>
@@ -1911,7 +1911,7 @@
</li>
<li>
<p>
- If <var>wrappingKey</var>.<a href="#dfn-Key-KeyUsage"><code>keyUsage</code></a> does not
+ If <var>wrappingKey</var>.<a href="#dfn-Key-KeyUsage"><code>usages</code></a> does not
contain the <code>"wrap"</code> <a href="#dfn-KeyUsage"><code>KeyUsage</code></a>,
terminate this algorithm with an error.
</p>
@@ -2034,7 +2034,7 @@
</li>
<li>
<p>
- If <var>unwrappingKey</var>.<a href="#dfn-Key-KeyUsage"><code>keyUsage</code></a> does not
+ If <var>unwrappingKey</var>.<a href="#dfn-Key-KeyUsage"><code>usages</code></a> does not
contain the <code>"unwrap"</code> <a href="#dfn-KeyUsage"><code>KeyUsage</code></a>,
terminate this algorithm with an error.
</p>
--- a/spec/Overview.html Mon Jul 01 12:26:26 2013 -0700
+++ b/spec/Overview.html Wed Jul 03 16:18:01 2013 -0700
@@ -28,7 +28,7 @@
<link rel="stylesheet" href="//www.w3.org/StyleSheets/TR/W3C-ED" type="text/css" /></head>
<body>
- <div class="head"><div><a href="http://www.w3.org/"><img src="//www.w3.org/Icons/w3c_home" width="72" height="48" alt="W3C" /></a></div><h1>Web Cryptography API</h1><h2>W3C Editor’s Draft <em>24 June 2013</em></h2><dl><dt>Latest Editor’s Draft:</dt><dd><a href="http://dvcs.w3.org/hg/webcrypto-api/raw-file/tip/spec/Overview.html">http://dvcs.w3.org/hg/webcrypto-api/raw-file/tip/spec/Overview.html</a></dd><dt>Latest Published Version:</dt><dd><a href="http://www.w3.org/TR/WebCryptoAPI/">http://www.w3.org/TR/WebCryptoAPI/</a></dd><dt>Previous Version(s):</dt><dd><a href="https://dvcs.w3.org/hg/webcrypto-api/raw-file/0fe9b34c13fb/spec/Overview.html">https://dvcs.w3.org/hg/webcrypto-api/raw-file/0fe9b34c13fb/spec/Overview.html</a></dd><dt>Editors:</dt><dd><a href="http://ddahl.com/">David Dahl</a>, Mozilla Corporation <ddahl@mozilla.com></dd><dd><a href="http://www.google.com/">Ryan Sleevi</a>, Google, Inc. <sleevi@google.com></dd><dt>Participate:</dt><dd><p>Send feedback to <a href="mailto:public-webcrypto@w3.org?subject=%5BWebCryptoAPI%5D">public-webcrypto@w3.org</a> (<a href="http://lists.w3.org/Archives/Public/public-webcrypto/">archives</a>), or <a href="https://www.w3.org/Bugs/Public/enter_bug.cgi?product=Web%20Cryptography&component=Web%20Cryptography%20API%20Document">file a bug</a>
+ <div class="head"><div><a href="http://www.w3.org/"><img src="//www.w3.org/Icons/w3c_home" width="72" height="48" alt="W3C" /></a></div><h1>Web Cryptography API</h1><h2>W3C Editor’s Draft <em>3 July 2013</em></h2><dl><dt>Latest Editor’s Draft:</dt><dd><a href="http://dvcs.w3.org/hg/webcrypto-api/raw-file/tip/spec/Overview.html">http://dvcs.w3.org/hg/webcrypto-api/raw-file/tip/spec/Overview.html</a></dd><dt>Latest Published Version:</dt><dd><a href="http://www.w3.org/TR/WebCryptoAPI/">http://www.w3.org/TR/WebCryptoAPI/</a></dd><dt>Previous Version(s):</dt><dd><a href="https://dvcs.w3.org/hg/webcrypto-api/raw-file/0fe9b34c13fb/spec/Overview.html">https://dvcs.w3.org/hg/webcrypto-api/raw-file/0fe9b34c13fb/spec/Overview.html</a></dd><dt>Editors:</dt><dd><a href="http://ddahl.com/">David Dahl</a>, Mozilla Corporation <ddahl@mozilla.com></dd><dd><a href="http://www.google.com/">Ryan Sleevi</a>, Google, Inc. <sleevi@google.com></dd><dt>Participate:</dt><dd><p>Send feedback to <a href="mailto:public-webcrypto@w3.org?subject=%5BWebCryptoAPI%5D">public-webcrypto@w3.org</a> (<a href="http://lists.w3.org/Archives/Public/public-webcrypto/">archives</a>), or <a href="https://www.w3.org/Bugs/Public/enter_bug.cgi?product=Web%20Cryptography&component=Web%20Cryptography%20API%20Document">file a bug</a>
(see <a href="https://www.w3.org/Bugs/Public/buglist.cgi?product=Web%20Cryptography&component=Web%20Cryptography%20API%20Document&resolution=---">existing bugs</a>).</p></dd></dl><p class="copyright"><a href="http://www.w3.org/Consortium/Legal/ipr-notice#Copyright">Copyright</a> © view <a href="http://www.w3.org/"><abbr title="World Wide Web Consortium">W3C</abbr></a><sup>®</sup> (<a href="http://www.csail.mit.edu/"><abbr title="Massachusetts Institute of Technology">MIT</abbr></a>, <a href="http://www.ercim.org/"><abbr title="European Research Consortium for Informatics and Mathematics">ERCIM</abbr></a>, <a href="http://www.keio.ac.jp/">Keio</a>), All Rights Reserved. W3C <a href="http://www.w3.org/Consortium/Legal/ipr-notice#Legal_Disclaimer">liability</a>, <a href="http://www.w3.org/Consortium/Legal/ipr-notice#W3C_Trademarks">trademark</a> and <a href="http://www.w3.org/Consortium/Legal/copyright-documents">document use</a> rules apply.</p></div><hr />
<div class="section">
@@ -56,7 +56,7 @@
report can be found in the <a href="http://www.w3.org/TR/">W3C technical
reports index</a> at http://www.w3.org/TR/.
</em></p><p>
- This document is the 24 June 2013 <b>Editor’s Draft</b> of the
+ This document is the 3 July 2013 <b>Editor’s Draft</b> of the
<cite>Web Cryptography API</cite> specification.
Please send comments about this document to
@@ -704,7 +704,7 @@
readonly attribute KeyType <a href="#dfn-Key-type">type</a>;
readonly attribute bool <a href="#dfn-Key-extractable">extractable</a>;
readonly attribute <a href="#dfn-Algorithm">Algorithm</a> <a href="#dfn-Key-algorithm">algorithm</a>;
- readonly attribute <a href="#dfn-KeyUsage">KeyUsage</a>[] <a href="#dfn-Key-keyUsage">keyUsage</a>;
+ readonly attribute <a href="#dfn-KeyUsage">KeyUsage</a>[] <a href="#dfn-Key-usages">usages</a>;
};
</code></pre></div></div>
<div id="key-interface-description" class="section">
@@ -745,7 +745,7 @@
<dd>
The <a href="#dfn-Algorithm"><code>Algorithm</code></a> used to generate the key.
</dd>
- <dt id="dfn-Key-keyUsage"><code>keyUsage</code></dt>
+ <dt id="dfn-Key-usages"><code>usages</code></dt>
<dd>
An <code>Array</code> of <a href="#dfn-KeyUsage"><code>KeyUsages</code></a> that
indicate what <a href="#dfn-CryptoOperation">CryptoOperations</a> may be used with this
@@ -776,7 +776,7 @@
<li><a href="#dfn-Key-type">type</a></li>
<li><a href="#dfn-Key-extractable">extractable</a></li>
<li><a href="#dfn-Key-algorithm">Algorithm</a></li>
- <li><a href="#dfn-Key-keyUsage">KeyUsage</a></li>
+ <li><a href="#dfn-Key-usages">KeyUsage</a></li>
</ul>
</li>
<li>
@@ -1839,7 +1839,7 @@
</li>
<li>
<p>
- If <var>baseKey</var>.<a href="#dfn-Key-keyUsage"><code>keyUsage</code></a> does not
+ If <var>baseKey</var>.<a href="#dfn-Key-usages"><code>usages</code></a> does not
contain the <code>"derive"</code> <a href="#dfn-KeyUsage"><code>KeyUsage</code></a>,
terminate this algorithm with an error.
</p>
@@ -1920,7 +1920,7 @@
</li>
<li>
<p>
- If <var>wrappingKey</var>.<a href="#dfn-Key-KeyUsage"><code>keyUsage</code></a> does not
+ If <var>wrappingKey</var>.<a href="#dfn-Key-KeyUsage"><code>usages</code></a> does not
contain the <code>"wrap"</code> <a href="#dfn-KeyUsage"><code>KeyUsage</code></a>,
terminate this algorithm with an error.
</p>
@@ -2043,7 +2043,7 @@
</li>
<li>
<p>
- If <var>unwrappingKey</var>.<a href="#dfn-Key-KeyUsage"><code>keyUsage</code></a> does not
+ If <var>unwrappingKey</var>.<a href="#dfn-Key-KeyUsage"><code>usages</code></a> does not
contain the <code>"unwrap"</code> <a href="#dfn-KeyUsage"><code>KeyUsage</code></a>,
terminate this algorithm with an error.
</p>