Prepare methods for additional KeyFormat enum values (#419)

Author: panva

spec/Overview.html

@@ -2301,46 +2301,43 @@ <h4>The importKey method</h4>
               <li>
                 <dl class="switch">
                   <dt>
-                    If |format| is equal to the string {{KeyFormat/"raw"}},
-                    {{KeyFormat/"pkcs8"}}, or {{KeyFormat/"spki"}}:
+                    If |format| is equal to the string {{KeyFormat/"jwk"}}:
                   </dt>
                   <dd>
                     <ol>
                       <li>
                         <p>
                           If the `keyData` parameter passed to the
-                          {{SubtleCrypto/importKey()}} method is a
+                          {{SubtleCrypto/importKey()}} method is not a
                           {{JsonWebKey}} dictionary, [= exception/throw =] a
                           {{TypeError}}.
                         </p>
                       </li>
                       <li>
                         <p>
-                          Let |keyData| be the result of
-                          [= get a copy of the buffer source |
-                          getting a copy of the bytes held by =] the
-                          `keyData` parameter passed to the
+                          Let |keyData| be the `keyData` parameter passed to the
                           {{SubtleCrypto/importKey()}} method.
                         </p>
                       </li>
                     </ol>
                   </dd>
-                  <dt>
-                    If |format| is equal to the string {{KeyFormat/"jwk"}}:
-                  </dt>
+                  <dt>Otherwise:</dt>
                   <dd>
                     <ol>
                       <li>
                         <p>
                           If the `keyData` parameter passed to the
-                          {{SubtleCrypto/importKey()}} method is not a
+                          {{SubtleCrypto/importKey()}} method is a
                           {{JsonWebKey}} dictionary, [= exception/throw =] a
                           {{TypeError}}.
                         </p>
                       </li>
                       <li>
                         <p>
-                          Let |keyData| be the `keyData` parameter passed to the
+                          Let |keyData| be the result of
+                          [= get a copy of the buffer source |
+                          getting a copy of the bytes held by =] the
+                          `keyData` parameter passed to the
                           {{SubtleCrypto/importKey()}} method.
                         </p>
                       </li>
@@ -2515,21 +2512,18 @@ <h4>The exportKey method</h4>
               </li>
               <li>
                 <dl class="switch">
-                  <dt>
-                    If |format| is equal to the strings {{KeyFormat/"raw"}},
-                    {{KeyFormat/"pkcs8"}}, or {{KeyFormat/"spki"}}:
-                  </dt>
-                  <dd>
-                    Let |result| be the result of [= ArrayBuffer/create | creating =] an {{ArrayBuffer}}
-                    in |realm|, containing |result|.
-                  </dd>
                   <dt>
                     If |format| is equal to the string {{KeyFormat/"jwk"}}:
                   </dt>
                   <dd>
                     Let |result| be the result of converting |result| to an ECMAScript Object in |realm|,
                     as defined by [[WebIDL]].
                   </dd>
+                  <dt>Otherwise:</dt>
+                  <dd>
+                    Let |result| be the result of [= ArrayBuffer/create | creating =] an {{ArrayBuffer}}
+                    in |realm|, containing |result|.
+                  </dd>
                 </dl>
               </li>
               <li>
@@ -2658,13 +2652,6 @@ <h4>The wrapKey method</h4>
               </li>
               <li>
                 <dl class="switch">
-                  <dt>
-                    If |format| is equal to the strings {{KeyFormat/"raw"}},
-                    {{KeyFormat/"pkcs8"}}, or {{KeyFormat/"spki"}}:
-                  </dt>
-                  <dd>
-                    Let |bytes| be |exportedKey|.
-                  </dd>
                   <dt>
                     If |format| is equal to the string {{KeyFormat/"jwk"}}:
                   </dt>
@@ -2685,6 +2672,10 @@ <h4>The wrapKey method</h4>
                       </li>
                     </ol>
                   </dd>
+                  <dt>Otherwise:</dt>
+                  <dd>
+                    Let |bytes| be |exportedKey|.
+                  </dd>
                 </dl>
                 <div class=note>
                   <p>
@@ -2886,13 +2877,6 @@ <h4>The unwrapKey method</h4>
               </li>
               <li>
                 <dl class="switch">
-                  <dt>
-                    If |format| is equal to the strings {{KeyFormat/"raw"}},
-                    {{KeyFormat/"pkcs8"}}, or {{KeyFormat/"spki"}}:
-                  </dt>
-                  <dd>
-                    Let |key| be |bytes|.
-                  </dd>
                   <dt>
                     If |format| is equal to the string {{KeyFormat/"jwk"}}:
                   </dt>
@@ -2901,6 +2885,10 @@ <h4>The unwrapKey method</h4>
                     [= parse a JWK =] algorithm, with |bytes|
                     as the `data` to be parsed.
                   </dd>
+                  <dt>Otherwise:</dt>
+                  <dd>
+                    Let |key| be |bytes|.
+                  </dd>
                 </dl>
               </li>
               <li>