Cleanup: rename usage_mask --> usages.

content/child/webcrypto/openssl/rsa_key_openssl.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/openssl/rsa_key_openssl.h"
 
 #include <openssl/evp.h>
 #include <openssl/pkcs12.h>
 
 #include "base/logging.h"
@@ skipping 77 matching lines @@
       rsa_algorithm, modulus_length_bits, &e[0], e.size(), hash_algorithm);
 
   return Status::Success();
 }
 
 Status CreateWebCryptoPrivateKey(
     crypto::ScopedEVP_PKEY private_key,
     const blink::WebCryptoAlgorithmId rsa_algorithm_id,
     const blink::WebCryptoAlgorithm& hash,
     bool extractable,
-    blink::WebCryptoKeyUsageMask usage_mask,
+    blink::WebCryptoKeyUsageMask usages,
     blink::WebCryptoKey* key) {
   blink::WebCryptoKeyAlgorithm key_algorithm;
   Status status = CreateRsaHashedKeyAlgorithm(
       rsa_algorithm_id, hash.id(), private_key.get(), &key_algorithm);
   if (status.IsError())
     return status;
 
   // Serialize the key at creation time so that if structured cloning is
   // requested it can be done synchronously from the Blink thread.
   std::vector<uint8_t> pkcs8_data;
   status = ExportPKeyPkcs8(private_key.get(), &pkcs8_data);
   if (status.IsError())
     return status;
 
   *key = blink::WebCryptoKey::create(
       new AsymKeyOpenSsl(private_key.Pass(), CryptoData(pkcs8_data)),
       blink::WebCryptoKeyTypePrivate,
       extractable,
       key_algorithm,
-      usage_mask);
+      usages);
   return Status::Success();
 }
 
 Status CreateWebCryptoPublicKey(
     crypto::ScopedEVP_PKEY public_key,
     const blink::WebCryptoAlgorithmId rsa_algorithm_id,
     const blink::WebCryptoAlgorithm& hash,
     bool extractable,
-    blink::WebCryptoKeyUsageMask usage_mask,
+    blink::WebCryptoKeyUsageMask usages,
     blink::WebCryptoKey* key) {
   blink::WebCryptoKeyAlgorithm key_algorithm;
   Status status = CreateRsaHashedKeyAlgorithm(
       rsa_algorithm_id, hash.id(), public_key.get(), &key_algorithm);
   if (status.IsError())
     return status;
 
   // Serialize the key at creation time so that if structured cloning is
   // requested it can be done synchronously from the Blink thread.
   std::vector<uint8_t> spki_data;
   status = ExportPKeySpki(public_key.get(), &spki_data);
   if (status.IsError())
     return status;
 
   *key = blink::WebCryptoKey::create(
       new AsymKeyOpenSsl(public_key.Pass(), CryptoData(spki_data)),
       blink::WebCryptoKeyTypePublic,
       extractable,
       key_algorithm,
-      usage_mask);
+      usages);
   return Status::Success();
 }
 
 // Converts a BIGNUM to a big endian byte array.
 std::vector<uint8_t> BIGNUMToVector(BIGNUM* n) {
   std::vector<uint8_t> v(BN_num_bytes(n));
   BN_bn2bin(n, vector_as_array(&v));
   return v;
 }
 
 // Allocates a new BIGNUM given a std::string big-endian representation.
 BIGNUM* CreateBIGNUM(const std::string& n) {
   return BN_bin2bn(reinterpret_cast<const uint8_t*>(n.data()), n.size(), NULL);
 }
 
 Status ImportRsaPrivateKey(const blink::WebCryptoAlgorithm& algorithm,
                            bool extractable,
-                           blink::WebCryptoKeyUsageMask usage_mask,
+                           blink::WebCryptoKeyUsageMask usages,
                            const JwkRsaInfo& params,
                            blink::WebCryptoKey* key) {
   crypto::ScopedRSA rsa(RSA_new());
 
   rsa->n = CreateBIGNUM(params.n);
   rsa->e = CreateBIGNUM(params.e);
   rsa->d = CreateBIGNUM(params.d);
   rsa->p = CreateBIGNUM(params.p);
   rsa->q = CreateBIGNUM(params.q);
   rsa->dmp1 = CreateBIGNUM(params.dp);
@@ skipping 12 matching lines @@
 
   // Create a corresponding EVP_PKEY.
   crypto::ScopedEVP_PKEY pkey(EVP_PKEY_new());
   if (!pkey || !EVP_PKEY_set1_RSA(pkey.get(), rsa.get()))
     return Status::OperationError();
 
   return CreateWebCryptoPrivateKey(pkey.Pass(),
                                    algorithm.id(),
                                    algorithm.rsaHashedImportParams()->hash(),
                                    extractable,
-                                   usage_mask,
+                                   usages,
                                    key);
 }
 
 Status ImportRsaPublicKey(const blink::WebCryptoAlgorithm& algorithm,
                           bool extractable,
-                          blink::WebCryptoKeyUsageMask usage_mask,
+                          blink::WebCryptoKeyUsageMask usages,
                           const CryptoData& n,
                           const CryptoData& e,
                           blink::WebCryptoKey* key) {
   crypto::ScopedRSA rsa(RSA_new());
 
   rsa->n = BN_bin2bn(n.bytes(), n.byte_length(), NULL);
   rsa->e = BN_bin2bn(e.bytes(), e.byte_length(), NULL);
 
   if (!rsa->n || !rsa->e)
     return Status::OperationError();
 
   // Create a corresponding EVP_PKEY.
   crypto::ScopedEVP_PKEY pkey(EVP_PKEY_new());
   if (!pkey || !EVP_PKEY_set1_RSA(pkey.get(), rsa.get()))
     return Status::OperationError();
 
   return CreateWebCryptoPublicKey(pkey.Pass(),
                                   algorithm.id(),
                                   algorithm.rsaHashedImportParams()->hash(),
                                   extractable,
-                                  usage_mask,
+                                  usages,
                                   key);
 }
 
 }  // namespace
 
 Status RsaHashedAlgorithm::GenerateKey(
     const blink::WebCryptoAlgorithm& algorithm,
     bool extractable,
-    blink::WebCryptoKeyUsageMask combined_usage_mask,
+    blink::WebCryptoKeyUsageMask combined_usages,
     GenerateKeyResult* result) const {
   Status status = CheckKeyCreationUsages(
-      all_public_key_usages_ | all_private_key_usages_, combined_usage_mask);
+      all_public_key_usages_ | all_private_key_usages_, combined_usages);
   if (status.IsError())
     return status;
 
-  const blink::WebCryptoKeyUsageMask public_usage_mask =
-      combined_usage_mask & all_public_key_usages_;
-  const blink::WebCryptoKeyUsageMask private_usage_mask =
-      combined_usage_mask & all_private_key_usages_;
+  const blink::WebCryptoKeyUsageMask public_usages =
+      combined_usages & all_public_key_usages_;
+  const blink::WebCryptoKeyUsageMask private_usages =
+      combined_usages & all_private_key_usages_;
 
   const blink::WebCryptoRsaHashedKeyGenParams* params =
       algorithm.rsaHashedKeyGenParams();
 
   unsigned int public_exponent = 0;
   unsigned int modulus_length_bits = 0;
   status =
       GetRsaKeyGenParameters(params, &public_exponent, &modulus_length_bits);
   if (status.IsError())
     return status;
@@ skipping 30 matching lines @@
 
   blink::WebCryptoKey public_key;
   blink::WebCryptoKey private_key;
 
   // Note that extractable is unconditionally set to true. This is because per
   // the WebCrypto spec generated public keys are always public.
   status = CreateWebCryptoPublicKey(public_pkey.Pass(),
                                     algorithm.id(),
                                     params->hash(),
                                     true,
-                                    public_usage_mask,
+                                    public_usages,
                                     &public_key);
   if (status.IsError())
     return status;
 
   status = CreateWebCryptoPrivateKey(private_pkey.Pass(),
                                      algorithm.id(),
                                      params->hash(),
                                      extractable,
-                                     private_usage_mask,
+                                     private_usages,
                                      &private_key);
   if (status.IsError())
     return status;
 
   result->AssignKeyPair(public_key, private_key);
   return Status::Success();
 }
 
 Status RsaHashedAlgorithm::VerifyKeyUsagesBeforeImportKey(
     blink::WebCryptoKeyFormat format,
-    blink::WebCryptoKeyUsageMask usage_mask) const {
+    blink::WebCryptoKeyUsageMask usages) const {
   switch (format) {
     case blink::WebCryptoKeyFormatSpki:
-      return CheckKeyCreationUsages(all_public_key_usages_, usage_mask);
+      return CheckKeyCreationUsages(all_public_key_usages_, usages);
     case blink::WebCryptoKeyFormatPkcs8:
-      return CheckKeyCreationUsages(all_private_key_usages_, usage_mask);
+      return CheckKeyCreationUsages(all_private_key_usages_, usages);
     case blink::WebCryptoKeyFormatJwk:
       // TODO(eroman): http://crbug.com/395904
       return CheckKeyCreationUsages(
-          all_public_key_usages_ | all_private_key_usages_, usage_mask);
+          all_public_key_usages_ | all_private_key_usages_, usages);
     default:
       return Status::ErrorUnsupportedImportKeyFormat();
   }
 }
 
 Status RsaHashedAlgorithm::ImportKeyPkcs8(
     const CryptoData& key_data,
     const blink::WebCryptoAlgorithm& algorithm,
     bool extractable,
-    blink::WebCryptoKeyUsageMask usage_mask,
+    blink::WebCryptoKeyUsageMask usages,
     blink::WebCryptoKey* key) const {
   if (!key_data.byte_length())
     return Status::ErrorImportEmptyKeyData();
 
   crypto::OpenSSLErrStackTracer err_tracer(FROM_HERE);
 
   crypto::ScopedBIO bio(BIO_new_mem_buf(const_cast<uint8_t*>(key_data.bytes()),
                                         key_data.byte_length()));
   if (!bio.get())
     return Status::ErrorUnexpected();
@@ skipping 18 matching lines @@
   if (!RSA_check_key(rsa.get()))
     return Status::DataError();
 
   // TODO(eroman): Validate the algorithm OID against the webcrypto provided
   // hash. http://crbug.com/389400
 
   return CreateWebCryptoPrivateKey(private_key.Pass(),
                                    algorithm.id(),
                                    algorithm.rsaHashedImportParams()->hash(),
                                    extractable,
-                                   usage_mask,
+                                   usages,
                                    key);
 }
 
 Status RsaHashedAlgorithm::ImportKeySpki(
     const CryptoData& key_data,
     const blink::WebCryptoAlgorithm& algorithm,
     bool extractable,
-    blink::WebCryptoKeyUsageMask usage_mask,
+    blink::WebCryptoKeyUsageMask usages,
     blink::WebCryptoKey* key) const {
   if (!key_data.byte_length())
     return Status::ErrorImportEmptyKeyData();
 
   crypto::OpenSSLErrStackTracer err_tracer(FROM_HERE);
 
   crypto::ScopedBIO bio(BIO_new_mem_buf(const_cast<uint8_t*>(key_data.bytes()),
                                         key_data.byte_length()));
   if (!bio.get())
     return Status::ErrorUnexpected();
 
   crypto::ScopedEVP_PKEY public_key(d2i_PUBKEY_bio(bio.get(), NULL));
   if (!public_key.get())
     return Status::DataError();
 
   if (EVP_PKEY_id(public_key.get()) != EVP_PKEY_RSA)
     return Status::DataError();  // Data did not define an RSA key.
 
   // TODO(eroman): Validate the algorithm OID against the webcrypto provided
   // hash. http://crbug.com/389400
 
   return CreateWebCryptoPublicKey(public_key.Pass(),
                                   algorithm.id(),
                                   algorithm.rsaHashedImportParams()->hash(),
                                   extractable,
-                                  usage_mask,
+                                  usages,
                                   key);
 }
 
 Status RsaHashedAlgorithm::ImportKeyJwk(
     const CryptoData& key_data,
     const blink::WebCryptoAlgorithm& algorithm,
     bool extractable,
-    blink::WebCryptoKeyUsageMask usage_mask,
+    blink::WebCryptoKeyUsageMask usages,
     blink::WebCryptoKey* key) const {
   crypto::OpenSSLErrStackTracer err_tracer(FROM_HERE);
 
   const char* jwk_algorithm =
       GetJwkAlgorithm(algorithm.rsaHashedImportParams()->hash().id());
 
   if (!jwk_algorithm)
     return Status::ErrorUnexpected();
 
   JwkRsaInfo jwk;
   Status status =
-      ReadRsaKeyJwk(key_data, jwk_algorithm, extractable, usage_mask, &jwk);
+      ReadRsaKeyJwk(key_data, jwk_algorithm, extractable, usages, &jwk);
   if (status.IsError())
     return status;
 
   // Once the key type is known, verify the usages.
   status = CheckKeyCreationUsages(
       jwk.is_private_key ? all_private_key_usages_ : all_public_key_usages_,
-      usage_mask);
+      usages);
   if (status.IsError())
     return status;
 
   return jwk.is_private_key
-             ? ImportRsaPrivateKey(algorithm, extractable, usage_mask, jwk, key)
+             ? ImportRsaPrivateKey(algorithm, extractable, usages, jwk, key)
              : ImportRsaPublicKey(algorithm,
                                   extractable,
-                                  usage_mask,
+                                  usages,
                                   CryptoData(jwk.n),
                                   CryptoData(jwk.e),
                                   key);
 }
 
 Status RsaHashedAlgorithm::ExportKeyPkcs8(const blink::WebCryptoKey& key,
                                           std::vector<uint8_t>* buffer) const {
   if (key.type() != blink::WebCryptoKeyTypePrivate)
     return Status::ErrorUnexpectedKeyType();
   *buffer = AsymKeyOpenSsl::Cast(key)->serialized_key_data();
@@ skipping 47 matching lines @@
       return Status::Success();
 
     default:
       return Status::ErrorUnexpected();
   }
 }
 
 }  // namespace webcrypto
 
 }  // namespace content