[webcrypto] Add length parameter to HmacKeyAlgorithm. (chromium)

content/child/webcrypto/webcrypto_util.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/child/webcrypto/webcrypto_util.h"
 
 #include "base/base64.h"
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "third_party/WebKit/public/platform/WebCryptoAlgorithm.h"
@@ skipping 359 matching lines @@
     case blink::WebCryptoAlgorithmIdSha384:
     case blink::WebCryptoAlgorithmIdSha512:
       return 128;
     default:
       NOTREACHED();
       return 0;
   }
 }
 
 bool CreateSecretKeyAlgorithm(const blink::WebCryptoAlgorithm& algorithm,
-                              unsigned keylen_bytes,
+                              unsigned int keylen_bytes,
                               blink::WebCryptoKeyAlgorithm* key_algorithm) {
   switch (algorithm.id()) {
     case blink::WebCryptoAlgorithmIdHmac: {
       blink::WebCryptoAlgorithm hash = GetInnerHashAlgorithm(algorithm);
       if (hash.isNull())
         return false;
+#if defined(WEBCRYPTO_HMAC_KEY_HAS_LENGTH)
+      if (keylen_bytes > UINT_MAX / 8)
+        return false;
+#endif
       *key_algorithm = blink::WebCryptoKeyAlgorithm::adoptParamsAndCreate(
-          algorithm.id(), new blink::WebCryptoHmacKeyAlgorithmParams(hash));
+          algorithm.id(),
+#if defined(WEBCRYPTO_HMAC_KEY_HAS_LENGTH)
+          new blink::WebCryptoHmacKeyAlgorithmParams(hash, keylen_bytes * 8));
+#else
+          new blink::WebCryptoHmacKeyAlgorithmParams(hash));
+#endif
       return true;
     }
     case blink::WebCryptoAlgorithmIdAesKw:
     case blink::WebCryptoAlgorithmIdAesCbc:
     case blink::WebCryptoAlgorithmIdAesCtr:
     case blink::WebCryptoAlgorithmIdAesGcm:
       *key_algorithm = blink::WebCryptoKeyAlgorithm::adoptParamsAndCreate(
           algorithm.id(),
           new blink::WebCryptoAesKeyAlgorithmParams(keylen_bytes * 8));
       return true;
     default:
       return false;
   }
 }
 
 }  // namespace webcrypto
 
 }  // namespace content