[webcrypto] Use new parameter names (that end in "bits" vs "bytes").

content/renderer/webcrypto/webcrypto_impl_openssl.cc

 // Copyright 2013 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/webcrypto_impl.h"
 
 #include <vector>
 #include <openssl/aes.h>
 #include <openssl/evp.h>
 #include <openssl/hmac.h>
@@ skipping 33 matching lines @@
       return EVP_aes_128_cbc();
     case 24:
       return EVP_aes_192_cbc();
     case 32:
       return EVP_aes_256_cbc();
     default:
       return NULL;
   }
 }
 
-unsigned WebCryptoHmacParamsToBlockSize(
+// TODO(eroman): This is wrong. These constants are bytes not bits. Moreover
+//               this doesn't match the NSS version.
+unsigned WebCryptoHmacParamsToBlockSizeBytes(
     const blink::WebCryptoHmacKeyParams* params) {
   DCHECK(params);
   switch (params->hash().id()) {
     case blink::WebCryptoAlgorithmIdSha1:
       return SHA_DIGEST_LENGTH / 8;
     case blink::WebCryptoAlgorithmIdSha224:
       return SHA224_DIGEST_LENGTH / 8;
     case blink::WebCryptoAlgorithmIdSha256:
       return SHA256_DIGEST_LENGTH / 8;
     case blink::WebCryptoAlgorithmIdSha384:
@@ skipping 206 matching lines @@
     blink::WebCryptoKeyUsageMask usage_mask,
     blink::WebCryptoKey* key) {
 
   unsigned keylen_bytes = 0;
   blink::WebCryptoKeyType key_type;
   switch (algorithm.id()) {
     case blink::WebCryptoAlgorithmIdAesCbc: {
       const blink::WebCryptoAesKeyGenParams* params =
           algorithm.aesKeyGenParams();
       DCHECK(params);
-      if (params->length() % 8)
+      if (params->lengthBits() % 8)
         return false;
-      keylen_bytes = params->length() / 8;
+      keylen_bytes = params->lengthBits() / 8;
       if (!GetAESCipherByKeyLength(keylen_bytes)) {
         return false;
       }
       key_type = blink::WebCryptoKeyTypeSecret;
       break;
     }
     case blink::WebCryptoAlgorithmIdHmac: {
       const blink::WebCryptoHmacKeyParams* params = algorithm.hmacKeyParams();
       DCHECK(params);
-      if (!params->getLength(keylen_bytes)) {
-        keylen_bytes = WebCryptoHmacParamsToBlockSize(params);
+      if (params->hasLengthBytes()) {
+        keylen_bytes = params->optionalLengthBytes();
+      } else {
+        keylen_bytes = WebCryptoHmacParamsToBlockSizeBytes(params);
       }
       key_type = blink::WebCryptoKeyTypeSecret;
       break;
     }
 
     default: { return false; }
   }
 
   if (keylen_bytes == 0) {
     return false;
@@ skipping 225 matching lines @@
     const blink::WebCryptoAlgorithm& algorithm,
     bool extractable,
     blink::WebCryptoKeyUsageMask usage_mask,
     blink::WebCryptoKey* key) {
   // TODO(padolph): Placeholder for OpenSSL implementation.
   // Issue http://crbug.com/267888.
   return false;
 }
 
 }  // namespace content