Bug 25618: support extensibility of the hash algorithm for PBKDF2
authorMark Watson <watsonm@netflix.com>
Mon, 22 Sep 2014 15:22:06 -0700
changeset 214 bd631ae943c1
parent 213 891df82c0a4b
child 215 ddeca665af01
Bug 25618: support extensibility of the hash algorithm for PBKDF2
spec/Overview-WebCryptoAPI.xml
spec/Overview.html
--- a/spec/Overview-WebCryptoAPI.xml	Mon Sep 22 15:17:13 2014 -0700
+++ b/spec/Overview-WebCryptoAPI.xml	Mon Sep 22 15:22:06 2014 -0700
@@ -16324,7 +16324,14 @@
             The <code>"PBKDF2"</code> algorithm identifier is used to
             perform key derivation using the PKCS#5 password-based key
             derivation function version 2.0, as defined in
-            [<a href="#rfc2898">RFC2898</a>] using HMAC as the pseudo-random function.
+            [<a href="#rfc2898">RFC2898</a>] using HMAC as the pseudo-random function,
+            using the SHA hash functions defined
+            in this specification.
+          </p>
+          <p>
+            <a href="#dfn-applicable-specification">Other specifications</a>
+            may specify the use of additional hash algorithms with PBKDF2. Such specifications
+            must define the digest operation for the additional hash algorithms.
           </p>
         </div>
         <div id="pbkdf2-registration" class="section">
--- a/spec/Overview.html	Mon Sep 22 15:17:13 2014 -0700
+++ b/spec/Overview.html	Mon Sep 22 15:22:06 2014 -0700
@@ -15759,7 +15759,14 @@
             The <code>"PBKDF2"</code> algorithm identifier is used to
             perform key derivation using the PKCS#5 password-based key
             derivation function version 2.0, as defined in
-            [<a href="#rfc2898">RFC2898</a>] using HMAC as the pseudo-random function.
+            [<a href="#rfc2898">RFC2898</a>] using HMAC as the pseudo-random function,
+            using the SHA hash functions defined
+            in this specification.
+          </p>
+          <p>
+            <a href="#dfn-applicable-specification">Other specifications</a>
+            may specify the use of additional hash algorithms with PBKDF2. Such specifications
+            must define the digest operation for the additional hash algorithms.
           </p>
         </div>
         <div id="pbkdf2-registration" class="section">