Bug 24056 Add wrap/unwrap to algorithms supporting encrypt/decrypt
authorMark Watson <watsonm@netflix.com>
Fri, 24 Jan 2014 17:06:52 -0800
changeset 90 9542aa51a7c0
parent 89 5efe55b319fc
child 91 ff379c9139c3
Bug 24056 Add wrap/unwrap to algorithms supporting encrypt/decrypt
spec/Overview-WebCryptoAPI.xml
spec/Overview.html
--- a/spec/Overview-WebCryptoAPI.xml	Fri Jan 24 16:54:49 2014 -0800
+++ b/spec/Overview-WebCryptoAPI.xml	Fri Jan 24 17:06:52 2014 -0800
@@ -2211,8 +2211,8 @@
                 <td />
                 <td>&#10004;</td>
                 <td>&#10004;</td>
-                <td />
-                <td />
+                <td>&#10004;</td>
+                <td>&#10004;</td>
               </tr>
               <tr>
                 <td><a href="#rsassa-pkcs1">RSASSA-PKCS1-v1_5</a></td>
@@ -2256,8 +2256,8 @@
                 <td /> 
                 <td>&#10004;</td>
                 <td>&#10004;</td>
-                <td />
-                <td />
+                <td>&#10004;</td>
+                <td>&#10004;</td>
               </tr>
               <tr>
                 <td><a href="#ecdsa">ECDSA</a></td>
@@ -2301,8 +2301,8 @@
                 <td />
                 <td>&#10004;</td>
                 <td>&#10004;</td>
-                <td />
-                <td />
+                <td>&#10004;</td>
+                <td>&#10004;</td>
               </tr>
               <tr>
                 <td><a href="#aes-cbc">AES-CBC</a></td>
@@ -2316,8 +2316,8 @@
                 <td />
                 <td>&#10004;</td>
                 <td>&#10004;</td>
-                <td />
-                <td />
+                <td>&#10004;</td>
+                <td>&#10004;</td>
               </tr>
               <tr>
                 <td><a href="#aes-cmac">AES-CMAC</a></td>
@@ -2346,8 +2346,8 @@
                 <td />
                 <td>&#10004;</td>
                 <td>&#10004;</td>
-                <td />
-                <td />
+                <td>&#10004;</td>
+                <td>&#10004;</td>
               </tr>
               <tr>
                 <td><a href="#aes-cfb">AES-CFB</a></td>
@@ -2361,8 +2361,8 @@
                 <td />
                 <td>&#10004;</td>
                 <td>&#10004;</td>
-                <td />
-                <td />
+                <td>&#10004;</td>
+                <td>&#10004;</td>
               </tr>
               <tr>
                 <td><a href="#aes-kw">AES-KW</a></td>
@@ -2678,6 +2678,16 @@
                   <td>None</td>
                   <td>ArrayBuffer</td>
                 </tr>
+                <tr>
+                  <td>wrapKey</td>
+                  <td>None</td>
+                  <td>ArrayBuffer</td>
+                </tr>
+                <tr>
+                  <td>unwrapKey</td>
+                  <td>None</td>
+                  <td>Key</td>
+                </tr>
               </tbody>
             </table>
           </div>
@@ -2924,6 +2934,16 @@
                   <td>None</td>
                   <td>ArrayBuffer</td>
                 </tr>
+                <tr>
+                  <td>wrapKey</td>
+                  <td><a href="#dfn-RsaOaepParams">RsaOaepParams</a></td>
+                  <td>ArrayBuffer</td>
+                </tr>
+                <tr>
+                  <td>unwrapKey</td>
+                  <td><a href="#dfn-RsaOaepParams">RsaOaepParams</a></td>
+                  <td><a href="#dfn-Key">Key</a></td>
+                </tr>
               </tbody>
             </table>
           </div>
@@ -3337,6 +3357,16 @@
                   <td>None</td>
                   <td>ArrayBuffer</td>
                 </tr>
+                <tr>
+                  <td>wrapKey</td>
+                  <td><a href="#dfn-AesCtrParams">AesCtrParams</a></td>
+                  <td>ArrayBuffer</td>
+                </tr>
+                <tr>
+                  <td>unwrapKey</td>
+                  <td><a href="#dfn-AesCtrParams">AesCtrParams</a></td>
+                  <td><a href="#dfn-Key">Key</a></td>
+                </tr>
               </tbody>
             </table>
           </div>
@@ -3440,7 +3470,16 @@
                   <td>None</td>
                   <td>ArrayBuffer</td>
                 </tr>
-
+                <tr>
+                  <td>wrapKey</td>
+                  <td><a href="#dfn-AesCbcParams">AesCbcParams</a></td>
+                  <td>ArrayBuffer</td>
+                </tr>
+                <tr>
+                  <td>unwrapKey</td>
+                  <td><a href="#dfn-AesCbcParams">AesCbcParams</a></td>
+                  <td><a href="#dfn-Key">Key</a></td>
+                </tr>
               </tbody>
             </table>
           </div>
@@ -3577,7 +3616,16 @@
                   <td>None</td>
                   <td>ArrayBuffer</td>
                 </tr>
-
+                <tr>
+                  <td>wrapKey</td>
+                  <td><a href="#dfn-AesGcmParams">AesGcmParams</a></td>
+                  <td>ArrayBuffer</td>
+                </tr>
+                <tr>
+                  <td>unwrapKey</td>
+                  <td><a href="#dfn-AesGcmParams">AesGcmParams</a></td>
+                  <td><a href="#dfn-Key">Key</a></td>
+                </tr>
                </tbody>
              </table>
            </div>
@@ -3658,7 +3706,16 @@
                   <td>None</td>
                   <td>ArrayBuffer</td>
                 </tr>
-
+                <tr>
+                  <td>wrapKey</td>
+                  <td><a href="#dfn-AesCfbParams">AesCfbParams</a></td>
+                  <td>ArrayBuffer</td>
+                </tr>
+                <tr>
+                  <td>unwrapKey</td>
+                  <td><a href="#dfn-AesCfbParams">AesCfbParams</a></td>
+                  <td><a href="#dfn-Key">Key</a></td>
+                </tr>
               </tbody>
             </table>
           </div>
--- a/spec/Overview.html	Fri Jan 24 16:54:49 2014 -0800
+++ b/spec/Overview.html	Fri Jan 24 17:06:52 2014 -0800
@@ -2220,8 +2220,8 @@
                 <td></td>
                 <td>✔</td>
                 <td>✔</td>
-                <td></td>
-                <td></td>
+                <td>✔</td>
+                <td>✔</td>
               </tr>
               <tr>
                 <td><a href="#rsassa-pkcs1">RSASSA-PKCS1-v1_5</a></td>
@@ -2265,8 +2265,8 @@
                 <td></td> 
                 <td>✔</td>
                 <td>✔</td>
-                <td></td>
-                <td></td>
+                <td>✔</td>
+                <td>✔</td>
               </tr>
               <tr>
                 <td><a href="#ecdsa">ECDSA</a></td>
@@ -2310,8 +2310,8 @@
                 <td></td>
                 <td>✔</td>
                 <td>✔</td>
-                <td></td>
-                <td></td>
+                <td>✔</td>
+                <td>✔</td>
               </tr>
               <tr>
                 <td><a href="#aes-cbc">AES-CBC</a></td>
@@ -2325,8 +2325,8 @@
                 <td></td>
                 <td>✔</td>
                 <td>✔</td>
-                <td></td>
-                <td></td>
+                <td>✔</td>
+                <td>✔</td>
               </tr>
               <tr>
                 <td><a href="#aes-cmac">AES-CMAC</a></td>
@@ -2355,8 +2355,8 @@
                 <td></td>
                 <td>✔</td>
                 <td>✔</td>
-                <td></td>
-                <td></td>
+                <td>✔</td>
+                <td>✔</td>
               </tr>
               <tr>
                 <td><a href="#aes-cfb">AES-CFB</a></td>
@@ -2370,8 +2370,8 @@
                 <td></td>
                 <td>✔</td>
                 <td>✔</td>
-                <td></td>
-                <td></td>
+                <td>✔</td>
+                <td>✔</td>
               </tr>
               <tr>
                 <td><a href="#aes-kw">AES-KW</a></td>
@@ -2687,6 +2687,16 @@
                   <td>None</td>
                   <td>ArrayBuffer</td>
                 </tr>
+                <tr>
+                  <td>wrapKey</td>
+                  <td>None</td>
+                  <td>ArrayBuffer</td>
+                </tr>
+                <tr>
+                  <td>unwrapKey</td>
+                  <td>None</td>
+                  <td>Key</td>
+                </tr>
               </tbody>
             </table>
           </div>
@@ -2933,6 +2943,16 @@
                   <td>None</td>
                   <td>ArrayBuffer</td>
                 </tr>
+                <tr>
+                  <td>wrapKey</td>
+                  <td><a href="#dfn-RsaOaepParams">RsaOaepParams</a></td>
+                  <td>ArrayBuffer</td>
+                </tr>
+                <tr>
+                  <td>unwrapKey</td>
+                  <td><a href="#dfn-RsaOaepParams">RsaOaepParams</a></td>
+                  <td><a href="#dfn-Key">Key</a></td>
+                </tr>
               </tbody>
             </table>
           </div>
@@ -3346,6 +3366,16 @@
                   <td>None</td>
                   <td>ArrayBuffer</td>
                 </tr>
+                <tr>
+                  <td>wrapKey</td>
+                  <td><a href="#dfn-AesCtrParams">AesCtrParams</a></td>
+                  <td>ArrayBuffer</td>
+                </tr>
+                <tr>
+                  <td>unwrapKey</td>
+                  <td><a href="#dfn-AesCtrParams">AesCtrParams</a></td>
+                  <td><a href="#dfn-Key">Key</a></td>
+                </tr>
               </tbody>
             </table>
           </div>
@@ -3449,7 +3479,16 @@
                   <td>None</td>
                   <td>ArrayBuffer</td>
                 </tr>
-
+                <tr>
+                  <td>wrapKey</td>
+                  <td><a href="#dfn-AesCbcParams">AesCbcParams</a></td>
+                  <td>ArrayBuffer</td>
+                </tr>
+                <tr>
+                  <td>unwrapKey</td>
+                  <td><a href="#dfn-AesCbcParams">AesCbcParams</a></td>
+                  <td><a href="#dfn-Key">Key</a></td>
+                </tr>
               </tbody>
             </table>
           </div>
@@ -3586,7 +3625,16 @@
                   <td>None</td>
                   <td>ArrayBuffer</td>
                 </tr>
-
+                <tr>
+                  <td>wrapKey</td>
+                  <td><a href="#dfn-AesGcmParams">AesGcmParams</a></td>
+                  <td>ArrayBuffer</td>
+                </tr>
+                <tr>
+                  <td>unwrapKey</td>
+                  <td><a href="#dfn-AesGcmParams">AesGcmParams</a></td>
+                  <td><a href="#dfn-Key">Key</a></td>
+                </tr>
                </tbody>
              </table>
            </div>
@@ -3667,7 +3715,16 @@
                   <td>None</td>
                   <td>ArrayBuffer</td>
                 </tr>
-
+                <tr>
+                  <td>wrapKey</td>
+                  <td><a href="#dfn-AesCfbParams">AesCfbParams</a></td>
+                  <td>ArrayBuffer</td>
+                </tr>
+                <tr>
+                  <td>unwrapKey</td>
+                  <td><a href="#dfn-AesCfbParams">AesCfbParams</a></td>
+                  <td><a href="#dfn-Key">Key</a></td>
+                </tr>
               </tbody>
             </table>
           </div>