Use size_t as the type of key_length and digest_length arguments of HMAC.

chrome/nacl/nacl_validation_query.cc

 // Copyright (c) 2012 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 "chrome/nacl/nacl_validation_query.h"
 
 #include "base/logging.h"
 #include "crypto/nss_util.h"
 #include "chrome/nacl/nacl_validation_db.h"
 #include "native_client/src/trusted/validator/validation_cache.h"
@@ skipping 32 matching lines @@
   // TODO(ncbray) remove when nacl_helper becomes the only code path.
   // http://code.google.com/p/chromium/issues/detail?id=118263
 #if defined(USE_NSS)
   crypto::ForceNSSNoDBInit();
 #endif
   CHECK(hasher_.Init(profile_key));
 }
 
 void NaClValidationQuery::AddData(const char* data, size_t length) {
   CHECK(state_ == READY);
-  CHECK(buffer_length_ >= 0);
-  CHECK(buffer_length_ <= (int) sizeof(buffer_));
+  CHECK(buffer_length_ <= sizeof(buffer_));
   // Chrome's HMAC class doesn't support incremental signing.  Work around
   // this by using a (small) temporary buffer to accumulate data.
   // Check if there is space in the buffer.
-  if (buffer_length_ + kDigestLength > (int) sizeof(buffer_)) {
+  if (buffer_length_ + kDigestLength > sizeof(buffer_)) {
     // Hash the buffer to make space.
     CompressBuffer();
   }
   // Hash the input data into the buffer.  Assumes that sizeof(buffer_) >=
   // kDigestLength * 2 (the buffer can store at least two digests.)
   CHECK(hasher_.Sign(base::StringPiece(data, length),
                      reinterpret_cast<unsigned char*>(buffer_ + buffer_length_),
                      kDigestLength));
   buffer_length_ += kDigestLength;
 }
 
 void NaClValidationQuery::AddData(const unsigned char* data, size_t length) {
   AddData(reinterpret_cast<const char*>(data), length);
 }
 
 void NaClValidationQuery::AddData(const base::StringPiece& data) {
   AddData(data.data(), data.length());
 }
 
 int NaClValidationQuery::QueryKnownToValidate() {
   CHECK(state_ == READY);
   // It is suspicious if we have less than a digest's worth of data.
   CHECK(buffer_length_ >= kDigestLength);
-  CHECK(buffer_length_ <= (int) sizeof(buffer_));
+  CHECK(buffer_length_ <= sizeof(buffer_));
   state_ = GET_CALLED;
   // Ensure the buffer contains only one digest worth of data.
   CompressBuffer();
   return db_->QueryKnownToValidate(std::string(buffer_, buffer_length_));
 }
 
 void NaClValidationQuery::SetKnownToValidate() {
   CHECK(state_ == GET_CALLED);
   CHECK(buffer_length_ == kDigestLength);
   state_ = SET_CALLED;
@@ skipping 43 matching lines @@
   // Make sure any fields introduced in a cross-repo change are zeroed.
   memset(cache, 0, sizeof(*cache));
   cache->handle = new NaClValidationQueryContext(db, profile_key, nacl_version);
   cache->CreateQuery = CreateQuery;
   cache->AddData = AddData;
   cache->QueryKnownToValidate = QueryKnownToValidate;
   cache->SetKnownToValidate = SetKnownToValidate;
   cache->DestroyQuery = DestroyQuery;
   return cache;
 }