Bug 24410 - operation descriptions for SHA
authorMark Watson <watsonm@netflix.com>
Thu, 20 Feb 2014 18:11:06 -0800
changeset 124 59edf569342c
parent 123 6973f252d137
child 125 19be0e9a2f81
Bug 24410 - operation descriptions for SHA
spec/Overview-WebCryptoAPI.xml
spec/Overview.html
--- a/spec/Overview-WebCryptoAPI.xml	Thu Feb 20 17:56:52 2014 -0800
+++ b/spec/Overview-WebCryptoAPI.xml	Thu Feb 20 18:11:06 2014 -0800
@@ -8677,7 +8677,7 @@
             <h4>Description</h4>
             <p>
               This describes the SHA-1 and SHA-2 families, as specified by
-              [<a href="#FIPS180-4">FIPS 180-4</a>].
+              [<a href="#FIPS180-4">FIPS PUB 180-4</a>].
             </p>
           </div>
           <div id="sha-registration" class="section">
@@ -8717,9 +8717,72 @@
           </div>
           <div id="sha-operations" class="section">
             <h4>Operations</h4>
-            <ul>
-              <li>Digest</li>
-            </ul>
+            <dl>
+              <dt>Digest</dt>
+              <dd>
+                <ol>
+                  <li>
+                    <dl class="switch">
+                      <dt>
+                        If the <a href="#dfn-KeyAlgorithm-name">name</a> property of
+                        <var>normalizedAlgorithm</var> is a cases-sensitve string match for
+                        <code>"SHA-1"</code>:
+                      </dt>
+                      <dd>
+                        Let <var>result</var> be the result of performing the SHA-1 hash function
+                        defined in Section 6.1 of [<a href="#FIPS180-4">FIPS PUB 180-4</a>] using
+                        <var>message</var> as the input message, <var>M</var>.
+                      </dd>
+                      <dt>
+                        If the <a href="#dfn-KeyAlgorithm-name">name</a> property of
+                        <var>normalizedAlgorithm</var> is a cases-sensitve string match for
+                        <code>"SHA-224"</code>:
+                      </dt>
+                      <dd>
+                        Let <var>result</var> be the result of performing the SHA-224 hash function
+                        defined in Section 6.3 of [<a href="#FIPS180-4">FIPS PUB 180-4</a>] using
+                        <var>message</var> as the input message, <var>M</var>.
+                      </dd>
+                      <dt>
+                        If the <a href="#dfn-KeyAlgorithm-name">name</a> property of
+                        <var>normalizedAlgorithm</var> is a cases-sensitve string match for
+                        <code>"SHA-256"</code>:
+                      </dt>
+                      <dd>
+                        Let <var>result</var> be the result of performing the SHA-256 hash function
+                        defined in Section 6.2 of [<a href="#FIPS180-4">FIPS PUB 180-4</a>] using
+                        <var>message</var> as the input message, <var>M</var>.
+                      </dd>
+                      <dt>
+                        If the <a href="#dfn-KeyAlgorithm-name">name</a> property of
+                        <var>normalizedAlgorithm</var> is a cases-sensitve string match for
+                        <code>"SHA-384"</code>:
+                      </dt>
+                      <dd>
+                        Let <var>result</var> be the result of performing the SHA-384 hash function
+                        defined in Section 6.5 of [<a href="#FIPS180-4">FIPS PUB 180-4</a>] using
+                        <var>message</var> as the input message, <var>M</var>.
+                      </dd>
+                      <dt>
+                        If the <a href="#dfn-KeyAlgorithm-name">name</a> property of
+                        <var>normalizedAlgorithm</var> is a cases-sensitve string match for
+                        <code>"SHA-512"</code>:
+                      </dt>
+                      <dd>
+                        Let <var>result</var> be the result of performing the SHA-1 hash function
+                        defined in Section 6.4 of [<a href="#FIPS180-4">FIPS PUB 180-4</a>] using
+                        <var>message</var> as the input message, <var>M</var>.
+                      </dd>
+                    </dl>
+                  </li>
+                  <li>
+                    <p>
+                      Return a new ArrayBuffer containing <var>result</var>.
+                    </p>
+                  </li>
+                </ol>
+              </dd>
+            </dl>
           </div>
         </div>
         <div id="concatkdf" class="section">
--- a/spec/Overview.html	Thu Feb 20 17:56:52 2014 -0800
+++ b/spec/Overview.html	Thu Feb 20 18:11:06 2014 -0800
@@ -8669,7 +8669,7 @@
             <h4>18.18.1. Description</h4>
             <p>
               This describes the SHA-1 and SHA-2 families, as specified by
-              [<a href="#FIPS180-4">FIPS 180-4</a>].
+              [<a href="#FIPS180-4">FIPS PUB 180-4</a>].
             </p>
           </div>
           <div id="sha-registration" class="section">
@@ -8709,9 +8709,72 @@
           </div>
           <div id="sha-operations" class="section">
             <h4>18.18.3. Operations</h4>
-            <ul>
-              <li>Digest</li>
-            </ul>
+            <dl>
+              <dt>Digest</dt>
+              <dd>
+                <ol>
+                  <li>
+                    <dl class="switch">
+                      <dt>
+                        If the <a href="#dfn-KeyAlgorithm-name">name</a> property of
+                        <var>normalizedAlgorithm</var> is a cases-sensitve string match for
+                        <code>"SHA-1"</code>:
+                      </dt>
+                      <dd>
+                        Let <var>result</var> be the result of performing the SHA-1 hash function
+                        defined in Section 6.1 of [<a href="#FIPS180-4">FIPS PUB 180-4</a>] using
+                        <var>message</var> as the input message, <var>M</var>.
+                      </dd>
+                      <dt>
+                        If the <a href="#dfn-KeyAlgorithm-name">name</a> property of
+                        <var>normalizedAlgorithm</var> is a cases-sensitve string match for
+                        <code>"SHA-224"</code>:
+                      </dt>
+                      <dd>
+                        Let <var>result</var> be the result of performing the SHA-224 hash function
+                        defined in Section 6.3 of [<a href="#FIPS180-4">FIPS PUB 180-4</a>] using
+                        <var>message</var> as the input message, <var>M</var>.
+                      </dd>
+                      <dt>
+                        If the <a href="#dfn-KeyAlgorithm-name">name</a> property of
+                        <var>normalizedAlgorithm</var> is a cases-sensitve string match for
+                        <code>"SHA-256"</code>:
+                      </dt>
+                      <dd>
+                        Let <var>result</var> be the result of performing the SHA-256 hash function
+                        defined in Section 6.2 of [<a href="#FIPS180-4">FIPS PUB 180-4</a>] using
+                        <var>message</var> as the input message, <var>M</var>.
+                      </dd>
+                      <dt>
+                        If the <a href="#dfn-KeyAlgorithm-name">name</a> property of
+                        <var>normalizedAlgorithm</var> is a cases-sensitve string match for
+                        <code>"SHA-384"</code>:
+                      </dt>
+                      <dd>
+                        Let <var>result</var> be the result of performing the SHA-384 hash function
+                        defined in Section 6.5 of [<a href="#FIPS180-4">FIPS PUB 180-4</a>] using
+                        <var>message</var> as the input message, <var>M</var>.
+                      </dd>
+                      <dt>
+                        If the <a href="#dfn-KeyAlgorithm-name">name</a> property of
+                        <var>normalizedAlgorithm</var> is a cases-sensitve string match for
+                        <code>"SHA-512"</code>:
+                      </dt>
+                      <dd>
+                        Let <var>result</var> be the result of performing the SHA-1 hash function
+                        defined in Section 6.4 of [<a href="#FIPS180-4">FIPS PUB 180-4</a>] using
+                        <var>message</var> as the input message, <var>M</var>.
+                      </dd>
+                    </dl>
+                  </li>
+                  <li>
+                    <p>
+                      Return a new ArrayBuffer containing <var>result</var>.
+                    </p>
+                  </li>
+                </ol>
+              </dd>
+            </dl>
           </div>
         </div>
         <div id="concatkdf" class="section">