[webcrypto] Change HMAC key generation length from bytes to bits.

content/renderer/webcrypto/shared_crypto.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/renderer/webcrypto/shared_crypto.h"
 
 #include "base/logging.h"
 #include "content/renderer/webcrypto/crypto_data.h"
 #include "content/renderer/webcrypto/platform_crypto.h"
 #include "content/renderer/webcrypto/webcrypto_util.h"
@@ skipping 297 matching lines @@
     case blink::WebCryptoAlgorithmIdAesKw: {
       if (!IsValidAesKeyLengthBits(algorithm.aesKeyGenParams()->lengthBits()))
         return Status::ErrorGenerateKeyLength();
       keylen_bytes = algorithm.aesKeyGenParams()->lengthBits() / 8;
       break;
     }
     case blink::WebCryptoAlgorithmIdHmac: {
       const blink::WebCryptoHmacKeyGenParams* params =
           algorithm.hmacKeyGenParams();
       DCHECK(params);
+#ifdef WEBCRYPTO_HMAC_BITS

[Ryan Sleevi, 2014/03/06 21:51:37]

if defined(...)

[eroman, 2014/03/06 21:54:18]

Done.

+      if (params->hasLengthBits()) {
+        if (params->optionalLengthBits() % 8)
+          return Status::ErrorGenerateKeyLength();
+        keylen_bytes = params->optionalLengthBits() / 8;
+#else
       if (params->hasLengthBytes()) {
         keylen_bytes = params->optionalLengthBytes();
+#endif
       } else {
         keylen_bytes = ShaBlockSizeBytes(params->hash().id());
         if (keylen_bytes == 0)
           return Status::ErrorUnsupported();
       }
       break;
     }
 
     default:
       return Status::ErrorUnsupported();
@@ skipping 146 matching lines @@
       return VerifyRsaSsaPkcs1v1_5(
           algorithm, key, signature, data, signature_match);
     default:
       return Status::ErrorUnsupported();
   }
 }
 
 }  // namespace webcrypto
 
 }  // namespace content