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

content/renderer/webcrypto/webcrypto_impl_nss.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 <cryptohi.h>
 #include <pk11pub.h>
 #include <sechash.h>
 
@@ skipping 184 matching lines @@
   switch (algorithm.id()) {
     case blink::WebCryptoAlgorithmIdAesCbc:
       return CKM_AES_KEY_GEN;
     case blink::WebCryptoAlgorithmIdHmac:
       return HmacAlgorithmToGenMechanism(algorithm);
     default:
       return CKM_INVALID_MECHANISM;
   }
 }
 
-unsigned int WebCryptoHmacAlgorithmToBlockSize(
+// TODO(eroman): This is duplicated in OpenSSL version.
+unsigned int WebCryptoHmacAlgorithmToBlockSizeBits(
     const blink::WebCryptoAlgorithm& algorithm) {
   DCHECK_EQ(algorithm.id(), blink::WebCryptoAlgorithmIdHmac);
   const blink::WebCryptoHmacKeyParams* params = algorithm.hmacKeyParams();
   DCHECK(params);
   switch (params->hash().id()) {
     case blink::WebCryptoAlgorithmIdSha1:
       return 512;
     case blink::WebCryptoAlgorithmIdSha256:
       return 512;
     default:
@@ skipping 445 matching lines @@
 
   if (mech == CKM_INVALID_MECHANISM) {
     return false;
   }
 
   switch (algorithm.id()) {
     case blink::WebCryptoAlgorithmIdAesCbc: {
       const blink::WebCryptoAesKeyGenParams* params =
           algorithm.aesKeyGenParams();
       DCHECK(params);
-      keylen_bytes = params->length() / 8;
-      if (params->length() % 8)
+      if (params->lengthBits() % 8)
         return false;
+      keylen_bytes = params->lengthBits() / 8;
       key_type = blink::WebCryptoKeyTypeSecret;
       break;
     }
     case blink::WebCryptoAlgorithmIdHmac: {
       const blink::WebCryptoHmacKeyParams* params = algorithm.hmacKeyParams();
       DCHECK(params);
-      if (!params->getLength(keylen_bytes)) {
-        keylen_bytes = WebCryptoHmacAlgorithmToBlockSize(algorithm) / 8;
+      if (params->hasLengthBytes()) {
+        keylen_bytes = params->optionalLengthBytes();
+      } else {
+        keylen_bytes = WebCryptoHmacAlgorithmToBlockSizeBits(algorithm) / 8;
       }
 
       key_type = blink::WebCryptoKeyTypeSecret;
       break;
     }
 
     default: {
       return false;
     }
   }
@@ skipping 31 matching lines @@
   switch (algorithm.id()) {
     case blink::WebCryptoAlgorithmIdRsaEsPkcs1v1_5:
     case blink::WebCryptoAlgorithmIdRsaOaep:
     case blink::WebCryptoAlgorithmIdRsaSsaPkcs1v1_5: {
       const blink::WebCryptoRsaKeyGenParams* const params =
           algorithm.rsaKeyGenParams();
       DCHECK(params);
 
       crypto::ScopedPK11Slot slot(PK11_GetInternalKeySlot());
       unsigned long public_exponent;
-      if (!slot || !params->modulusLength() ||
+      if (!slot || !params->modulusLengthBits() ||
           !BigIntegerToLong(params->publicExponent().data(),
                             params->publicExponent().size(),
                             &public_exponent) ||
           !public_exponent) {
         return false;
       }
 
       PK11RSAGenParams rsa_gen_params;
-      rsa_gen_params.keySizeInBits = params->modulusLength();
+      rsa_gen_params.keySizeInBits = params->modulusLengthBits();
       rsa_gen_params.pe = public_exponent;
 
       // Flags are verified at the Blink layer; here the flags are set to all
       // possible operations for the given key type.
       CK_FLAGS operation_flags;
       switch (algorithm.id()) {
         case blink::WebCryptoAlgorithmIdRsaEsPkcs1v1_5:
         case blink::WebCryptoAlgorithmIdRsaOaep:
           operation_flags = CKF_ENCRYPT | CKF_DECRYPT | CKF_WRAP | CKF_UNWRAP;
           break;
@@ skipping 251 matching lines @@
 
   *key = blink::WebCryptoKey::create(new PublicKeyHandle(pubkey.Pass()),
                                      blink::WebCryptoKeyTypePublic,
                                      extractable,
                                      algorithm,
                                      usage_mask);
   return true;
 }
 
 }  // namespace content