--- a/spec/Overview-WebCryptoAPI.xml Wed Jul 03 16:18:10 2013 -0700
+++ b/spec/Overview-WebCryptoAPI.xml Wed Jul 03 16:18:12 2013 -0700
@@ -1156,34 +1156,34 @@
<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,
- bool extractable = false,
- <a href="#dfn-KeyUsage">KeyUsage</a>[] keyUsages = []);
+ bool extractable = false,
+ <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,
- bool extractable = false,
- <a href="#dfn-KeyUsage">KeyUsage</a>[] keyUsages = []);
+ <a href="#dfn-Key">Key</a> baseKey,
+ <a href="#dfn-AlgorithmIdentifier">AlgorithmIdentifier</a>? derivedKeyType,
+ bool extractable = false,
+ <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,
- ArrayBufferView keyData,
- <a href="#dfn-AlgorithmIdentifier">AlgorithmIdentifier</a>? algorithm,
- bool extractable = false,
- <a href="#dfn-KeyUsage">KeyUsage</a>[] keyUsages = []);
+ ArrayBufferView keyData,
+ <a href="#dfn-AlgorithmIdentifier">AlgorithmIdentifier</a>? algorithm,
+ bool extractable = false,
+ <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>
Promise<any> <a href="#dfn-SubtleCrypto-method-wrapKey">wrapKey</a>(<a href="#dfn-KeyFormat">KeyFormat</a> format,
- <a href="#dfn-Key">Key</a> key,
- <a href="#dfn-Key">Key</a> wrappingKey,
- <a href="#dfn-AlgorithmIdentifier">AlgorithmIdentifier</a> wrapAlgorithm);
+ <a href="#dfn-Key">Key</a> key,
+ <a href="#dfn-Key">Key</a> wrappingKey,
+ <a href="#dfn-AlgorithmIdentifier">AlgorithmIdentifier</a> wrapAlgorithm);
Promise<any> <a href="#dfn-SubtleCrypto-method-unwrapKey">unwrapKey</a>(<a href="#dfn-KeyFormat">KeyFormat</a> format,
- ArrayBufferView wrappedKey,
- <a href="#dfn-Key">Key</a> unwrappingKey,
- <a href="#dfn-AlgorithmIdentifier">AlgorithmIdentifier</a> unwrapAlgorithm,
- <a href="#dfn-AlgorithmIdentifier">AlgorithmIdentifier?</a> unwrappedKeyAlgorithm,
- bool extractable = false,
- <a href="#dfn-KeyUsage">KeyUsage</a>[] keyUsages = []);
+ ArrayBufferView wrappedKey,
+ <a href="#dfn-Key">Key</a> unwrappingKey,
+ <a href="#dfn-AlgorithmIdentifier">AlgorithmIdentifier</a> unwrapAlgorithm,
+ <a href="#dfn-AlgorithmIdentifier">AlgorithmIdentifier?</a> unwrappedKeyAlgorithm,
+ bool extractable = false,
+ <a href="#dfn-KeyUsage">KeyUsage</a>[] keyUsages = []);
};
</x:codeblock>
<div class="ednote">
--- a/spec/Overview.html Wed Jul 03 16:18:10 2013 -0700
+++ b/spec/Overview.html Wed Jul 03 16:18:12 2013 -0700
@@ -1165,34 +1165,34 @@
<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,
- bool extractable = false,
- <a href="#dfn-KeyUsage">KeyUsage</a>[] keyUsages = []);
+ bool extractable = false,
+ <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,
- bool extractable = false,
- <a href="#dfn-KeyUsage">KeyUsage</a>[] keyUsages = []);
+ <a href="#dfn-Key">Key</a> baseKey,
+ <a href="#dfn-AlgorithmIdentifier">AlgorithmIdentifier</a>? derivedKeyType,
+ bool extractable = false,
+ <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,
- ArrayBufferView keyData,
- <a href="#dfn-AlgorithmIdentifier">AlgorithmIdentifier</a>? algorithm,
- bool extractable = false,
- <a href="#dfn-KeyUsage">KeyUsage</a>[] keyUsages = []);
+ ArrayBufferView keyData,
+ <a href="#dfn-AlgorithmIdentifier">AlgorithmIdentifier</a>? algorithm,
+ bool extractable = false,
+ <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>
Promise<any> <a href="#dfn-SubtleCrypto-method-wrapKey">wrapKey</a>(<a href="#dfn-KeyFormat">KeyFormat</a> format,
- <a href="#dfn-Key">Key</a> key,
- <a href="#dfn-Key">Key</a> wrappingKey,
- <a href="#dfn-AlgorithmIdentifier">AlgorithmIdentifier</a> wrapAlgorithm);
+ <a href="#dfn-Key">Key</a> key,
+ <a href="#dfn-Key">Key</a> wrappingKey,
+ <a href="#dfn-AlgorithmIdentifier">AlgorithmIdentifier</a> wrapAlgorithm);
Promise<any> <a href="#dfn-SubtleCrypto-method-unwrapKey">unwrapKey</a>(<a href="#dfn-KeyFormat">KeyFormat</a> format,
- ArrayBufferView wrappedKey,
- <a href="#dfn-Key">Key</a> unwrappingKey,
- <a href="#dfn-AlgorithmIdentifier">AlgorithmIdentifier</a> unwrapAlgorithm,
- <a href="#dfn-AlgorithmIdentifier">AlgorithmIdentifier?</a> unwrappedKeyAlgorithm,
- bool extractable = false,
- <a href="#dfn-KeyUsage">KeyUsage</a>[] keyUsages = []);
+ ArrayBufferView wrappedKey,
+ <a href="#dfn-Key">Key</a> unwrappingKey,
+ <a href="#dfn-AlgorithmIdentifier">AlgorithmIdentifier</a> unwrapAlgorithm,
+ <a href="#dfn-AlgorithmIdentifier">AlgorithmIdentifier?</a> unwrappedKeyAlgorithm,
+ bool extractable = false,
+ <a href="#dfn-KeyUsage">KeyUsage</a>[] keyUsages = []);
};
</code></pre></div></div>
<div class="ednote"><div class="ednoteHeader">Editorial note</div>