[webcrypto] Implement PBKDF2 (blink-side)

Source/platform/exported/WebCryptoAlgorithm.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 235 matching lines @@
             WebCryptoAlgorithmInfo::Undefined, // Sign
             WebCryptoAlgorithmInfo::Undefined, // Verify
             WebCryptoAlgorithmInfo::Undefined, // Digest
             WebCryptoAlgorithmInfo::Undefined, // GenerateKey
             WebCryptoAlgorithmParamsTypeNone, // ImportKey
             WebCryptoAlgorithmParamsTypeNone, // GetKeyLength
             WebCryptoAlgorithmParamsTypeHkdfParams, // DeriveBits
             WebCryptoAlgorithmInfo::Undefined, // WrapKey
             WebCryptoAlgorithmInfo::Undefined // UnwrapKey
         }
+    }, { // Index 15
+        "PBKDF2", {
+            WebCryptoAlgorithmInfo::Undefined, // Encrypt
+            WebCryptoAlgorithmInfo::Undefined, // Decrypt
+            WebCryptoAlgorithmInfo::Undefined, // Sign
+            WebCryptoAlgorithmInfo::Undefined, // Verify
+            WebCryptoAlgorithmInfo::Undefined, // Digest
+            WebCryptoAlgorithmInfo::Undefined, // GenerateKey
+            WebCryptoAlgorithmParamsTypeNone, // ImportKey
+            WebCryptoAlgorithmParamsTypeNone, // GetKeyLength
+            WebCryptoAlgorithmParamsTypePbkdf2Params, // DeriveBits
+            WebCryptoAlgorithmInfo::Undefined, // WrapKey
+            WebCryptoAlgorithmInfo::Undefined // UnwrapKey
+        }
     },
 };
 
 // Initializing the algorithmIdToInfo table above depends on knowing the enum
 // values for algorithm IDs. If those ever change, the table will need to be
 // updated.
 static_assert(WebCryptoAlgorithmIdAesCbc == 0, "AES CBC id must match");
 static_assert(WebCryptoAlgorithmIdHmac == 1, "HMAC id must match");
 static_assert(WebCryptoAlgorithmIdRsaSsaPkcs1v1_5 == 2, "RSASSA-PKCS1-v1_5 id must match");
 static_assert(WebCryptoAlgorithmIdSha1 == 3, "SHA1 id must match");
 static_assert(WebCryptoAlgorithmIdSha256 == 4, "SHA256 id must match");
 static_assert(WebCryptoAlgorithmIdSha384 == 5, "SHA384 id must match");
 static_assert(WebCryptoAlgorithmIdSha512 == 6, "SHA512 id must match");
 static_assert(WebCryptoAlgorithmIdAesGcm == 7, "AES GCM id must match");
 static_assert(WebCryptoAlgorithmIdRsaOaep == 8, "RSA OAEP id must match");
 static_assert(WebCryptoAlgorithmIdAesCtr == 9, "AES CTR id must match");
 static_assert(WebCryptoAlgorithmIdAesKw == 10, "AESKW id must match");
 static_assert(WebCryptoAlgorithmIdRsaPss == 11, "RSA-PSS id must match");
 static_assert(WebCryptoAlgorithmIdEcdsa == 12, "ECDSA id must match");
 static_assert(WebCryptoAlgorithmIdEcdh == 13, "ECDH id must match");
 static_assert(WebCryptoAlgorithmIdHkdf == 14, "HKDF id must match");
-static_assert(WebCryptoAlgorithmIdLast == 14, "last id must match");
+static_assert(WebCryptoAlgorithmIdPbkdf2 == 15, "Pbkdf2 id must match");
+static_assert(WebCryptoAlgorithmIdLast == 15, "last id must match");
 static_assert(10 == WebCryptoOperationLast, "the parameter mapping needs to be updated");
 
 } // namespace
 
 class WebCryptoAlgorithmPrivate : public ThreadSafeRefCounted<WebCryptoAlgorithmPrivate> {
 public:
     WebCryptoAlgorithmPrivate(WebCryptoAlgorithmId id, PassOwnPtr<WebCryptoAlgorithmParams> params)
         : id(id)
         , params(params)
     {
@@ skipping 13 matching lines @@
     return WebCryptoAlgorithm();
 }
 
 WebCryptoAlgorithm WebCryptoAlgorithm::adoptParamsAndCreate(WebCryptoAlgorithmId id, WebCryptoAlgorithmParams* params)
 {
     return WebCryptoAlgorithm(id, adoptPtr(params));
 }
 
 const WebCryptoAlgorithmInfo* WebCryptoAlgorithm::lookupAlgorithmInfo(WebCryptoAlgorithmId id)
 {
-    if (id < 0 || id >= WTF_ARRAY_LENGTH(algorithmIdToInfo))
+    const unsigned idInt = id;
+    if (idInt >= WTF_ARRAY_LENGTH(algorithmIdToInfo))

[xun.sun, 2015/01/13 19:16:29]

I made this change because I'm seeing the following build error very similar to
the ones in https://code.google.com/p/chromium/issues/detail?id=163104:

../../third_party/WebKit/Source/platform/exported/WebCryptoAlgorithm.cpp:327:11:
error: comparison of constant 16 with expression of type
'blink::WebCryptoAlgorithmId' is always false
[-Werror,-Wtautological-constant-out-of-range-compare]
    if (id>= WTF_ARRAY_LENGTH(algorithmIdToInfo))
        ~~^  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

As soon as the list of AlgorithmId's grows to 16 this error starts to appear.
Not sure why adding an Algorithmid would make the difference.

[eroman, 2015/01/14 21:12:22]

Not sure why it would do that.

         return 0;
     return &algorithmIdToInfo[id];
 }
 
 bool WebCryptoAlgorithm::isNull() const
 {
     return m_private.isNull();
 }
 
 WebCryptoAlgorithmId WebCryptoAlgorithm::id() const
@@ skipping 131 matching lines @@
 }
 
 const WebCryptoHkdfParams* WebCryptoAlgorithm::hkdfParams() const
 {
     ASSERT(!isNull());
     if (paramsType() == WebCryptoAlgorithmParamsTypeHkdfParams)
         return static_cast<WebCryptoHkdfParams*>(m_private->params.get());
     return 0;
 }
 
+const WebCryptoPbkdf2Params* WebCryptoAlgorithm::pbkdf2Params() const
+{
+    ASSERT(!isNull());
+    if (paramsType() == WebCryptoAlgorithmParamsTypePbkdf2Params)
+        return static_cast<WebCryptoPbkdf2Params*>(m_private->params.get());
+    return 0;
+}
+
 bool WebCryptoAlgorithm::isHash(WebCryptoAlgorithmId id)
 {
     switch (id) {
     case WebCryptoAlgorithmIdSha1:
     case WebCryptoAlgorithmIdSha256:
     case WebCryptoAlgorithmIdSha384:
     case WebCryptoAlgorithmIdSha512:
         return true;
     case WebCryptoAlgorithmIdAesCbc:
     case WebCryptoAlgorithmIdHmac:
     case WebCryptoAlgorithmIdRsaSsaPkcs1v1_5:
     case WebCryptoAlgorithmIdAesGcm:
     case WebCryptoAlgorithmIdRsaOaep:
     case WebCryptoAlgorithmIdAesCtr:
     case WebCryptoAlgorithmIdAesKw:
     case WebCryptoAlgorithmIdRsaPss:
     case WebCryptoAlgorithmIdEcdsa:
     case WebCryptoAlgorithmIdEcdh:
     case WebCryptoAlgorithmIdHkdf:
+    case WebCryptoAlgorithmIdPbkdf2:
         break;
     }
     return false;
 }
 
 bool WebCryptoAlgorithm::isKdf(WebCryptoAlgorithmId id)
 {
     switch (id) {
     case WebCryptoAlgorithmIdHkdf:
+    case WebCryptoAlgorithmIdPbkdf2:
         return true;
     case WebCryptoAlgorithmIdSha1:
     case WebCryptoAlgorithmIdSha256:
     case WebCryptoAlgorithmIdSha384:
     case WebCryptoAlgorithmIdSha512:
     case WebCryptoAlgorithmIdAesCbc:
     case WebCryptoAlgorithmIdHmac:
     case WebCryptoAlgorithmIdRsaSsaPkcs1v1_5:
     case WebCryptoAlgorithmIdAesGcm:
     case WebCryptoAlgorithmIdRsaOaep:
@@ skipping 11 matching lines @@
 {
     m_private = other.m_private;
 }
 
 void WebCryptoAlgorithm::reset()
 {
     m_private.reset();
 }
 
 } // namespace blink