--- a/spec/Overview-WebCryptoAPI.xml Mon Jul 22 12:08:19 2013 -0700
+++ b/spec/Overview-WebCryptoAPI.xml Mon Jul 22 12:08:23 2013 -0700
@@ -1156,20 +1156,20 @@
<span class="comment">// TBD: <a href="https://www.w3.org/2012/webcrypto/track/issues/36">ISSUE-36</a></span>
Promise<any> <a href="#dfn-SubtleCrypto-method-generateKey">generateKey</a>(<a href="#dfn-AlgorithmIdentifier">AlgorithmIdentifier</a> algorithm,
- boolean extractable = false,
- <a href="#dfn-KeyUsage">KeyUsage</a>[] keyUsages = []);
+ optional boolean extractable = false,
+ optional <a href="#dfn-KeyUsage">KeyUsage</a>[] keyUsages = []);
Promise<any> <a href="#dfn-SubtleCrypto-method-deriveKey">deriveKey</a>(<a href="#dfn-AlgorithmIdentifier">AlgorithmIdentifier</a> algorithm,
<a href="#dfn-Key">Key</a> baseKey,
<a href="#dfn-AlgorithmIdentifier">AlgorithmIdentifier</a>? derivedKeyType,
- boolean extractable = false,
- <a href="#dfn-KeyUsage">KeyUsage</a>[] keyUsages = []);
+ optional boolean extractable = false,
+ optional <a href="#dfn-KeyUsage">KeyUsage</a>[] keyUsages = []);
<span class="comment">// TBD: <a href="https://www.w3.org/2012/webcrypto/track/issues/35">ISSUE-35</a></span>
Promise<any> <a href="#dfn-SubtleCrypto-method-importKey">importKey</a>(<a href="#dfn-KeyFormat">KeyFormat</a> format,
CryptoOperationData keyData,
<a href="#dfn-AlgorithmIdentifier">AlgorithmIdentifier</a>? algorithm,
- boolean extractable = false,
- <a href="#dfn-KeyUsage">KeyUsage</a>[] keyUsages = []);
+ optional boolean extractable = false,
+ optional <a href="#dfn-KeyUsage">KeyUsage</a>[] keyUsages = []);
Promise<any> <a href="#dfn-SubtleCrypto-method-exportKey">exportKey</a>(<a href="#dfn-KeyFormat">KeyFormat</a> format, <a href="#dfn-Key">Key</a> key);
<span class="comment">// Note: wrapKey and unwrapKey remain "Features at Risk"</span>
@@ -1181,9 +1181,9 @@
CryptoOperationData wrappedKey,
<a href="#dfn-Key">Key</a> unwrappingKey,
<a href="#dfn-AlgorithmIdentifier">AlgorithmIdentifier</a> unwrapAlgorithm,
- <a href="#dfn-AlgorithmIdentifier">AlgorithmIdentifier?</a> unwrappedKeyAlgorithm,
- boolean extractable = false,
- <a href="#dfn-KeyUsage">KeyUsage</a>[] keyUsages = []);
+ <a href="#dfn-AlgorithmIdentifier">AlgorithmIdentifier</a>? unwrappedKeyAlgorithm,
+ optional boolean extractable = false,
+ optional <a href="#dfn-KeyUsage">KeyUsage</a>[] keyUsages = []);
};
</x:codeblock>
<div class="ednote">
--- a/spec/Overview.html Mon Jul 22 12:08:19 2013 -0700
+++ b/spec/Overview.html Mon Jul 22 12:08:23 2013 -0700
@@ -1165,20 +1165,20 @@
<span class="comment">// TBD: <a href="https://www.w3.org/2012/webcrypto/track/issues/36">ISSUE-36</a></span>
Promise<any> <a href="#dfn-SubtleCrypto-method-generateKey">generateKey</a>(<a href="#dfn-AlgorithmIdentifier">AlgorithmIdentifier</a> algorithm,
- boolean extractable = false,
- <a href="#dfn-KeyUsage">KeyUsage</a>[] keyUsages = []);
+ optional boolean extractable = false,
+ optional <a href="#dfn-KeyUsage">KeyUsage</a>[] keyUsages = []);
Promise<any> <a href="#dfn-SubtleCrypto-method-deriveKey">deriveKey</a>(<a href="#dfn-AlgorithmIdentifier">AlgorithmIdentifier</a> algorithm,
<a href="#dfn-Key">Key</a> baseKey,
<a href="#dfn-AlgorithmIdentifier">AlgorithmIdentifier</a>? derivedKeyType,
- boolean extractable = false,
- <a href="#dfn-KeyUsage">KeyUsage</a>[] keyUsages = []);
+ optional boolean extractable = false,
+ optional <a href="#dfn-KeyUsage">KeyUsage</a>[] keyUsages = []);
<span class="comment">// TBD: <a href="https://www.w3.org/2012/webcrypto/track/issues/35">ISSUE-35</a></span>
Promise<any> <a href="#dfn-SubtleCrypto-method-importKey">importKey</a>(<a href="#dfn-KeyFormat">KeyFormat</a> format,
CryptoOperationData keyData,
<a href="#dfn-AlgorithmIdentifier">AlgorithmIdentifier</a>? algorithm,
- boolean extractable = false,
- <a href="#dfn-KeyUsage">KeyUsage</a>[] keyUsages = []);
+ optional boolean extractable = false,
+ optional <a href="#dfn-KeyUsage">KeyUsage</a>[] keyUsages = []);
Promise<any> <a href="#dfn-SubtleCrypto-method-exportKey">exportKey</a>(<a href="#dfn-KeyFormat">KeyFormat</a> format, <a href="#dfn-Key">Key</a> key);
<span class="comment">// Note: wrapKey and unwrapKey remain "Features at Risk"</span>
@@ -1190,9 +1190,9 @@
CryptoOperationData wrappedKey,
<a href="#dfn-Key">Key</a> unwrappingKey,
<a href="#dfn-AlgorithmIdentifier">AlgorithmIdentifier</a> unwrapAlgorithm,
- <a href="#dfn-AlgorithmIdentifier">AlgorithmIdentifier?</a> unwrappedKeyAlgorithm,
- boolean extractable = false,
- <a href="#dfn-KeyUsage">KeyUsage</a>[] keyUsages = []);
+ <a href="#dfn-AlgorithmIdentifier">AlgorithmIdentifier</a>? unwrappedKeyAlgorithm,
+ optional boolean extractable = false,
+ optional <a href="#dfn-KeyUsage">KeyUsage</a>[] keyUsages = []);
};
</code></pre></div></div>
<div class="ednote"><div class="ednoteHeader">Editorial note</div>