Use size_t as the type of the key_length and digest_length arguments

of HMAC::Init() and HMAC::Sign().

R=agl@chromium.org,bradnelson@chromium.org,thakis@chromium.org
BUG=none
TEST=none

Review URL: https://chromiumcodereview.appspot.com/11419270

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@170852 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 6 insertions, 7 deletions

diff --git a/chrome/browser/internal_auth.cc b/chrome/browser/internal_auth.cc
index aa7fe72..b610832 100644
--- a/chrome/browser/internal_auth.cc
+++ b/chrome/browser/internal_auth.cc
@@ -65,7 +65,7 @@ const char kItemSeparator = '\n';
 const char kVarValueSeparator = '=';
 
 const size_t kKeySizeInBytes = 128 / 8;
-const int kHMACSizeInBytes = 256 / 8;
+const size_t kHMACSizeInBytes = 256 / 8;
 
 // Length of base64 string required to encode given number of raw octets.
 #define BASE64_PER_RAW(X) (X > 0 ? ((X - 1) / 3 + 1) * 4 : 0)
diff --git a/chrome/nacl/nacl_validation_query.cc b/chrome/nacl/nacl_validation_query.cc
index e4ee7ff..37d9b78 100644
--- a/chrome/nacl/nacl_validation_query.cc
+++ b/chrome/nacl/nacl_validation_query.cc
@@ -50,12 +50,11 @@ NaClValidationQuery::NaClValidationQuery(NaClValidationDB* db,
 
 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();
   }
@@ -79,7 +78,7 @@ 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();
diff --git a/chrome/nacl/nacl_validation_query.h b/chrome/nacl/nacl_validation_query.h
index 6e4230e..e5b02f9 100644
--- a/chrome/nacl/nacl_validation_query.h
+++ b/chrome/nacl/nacl_validation_query.h
@@ -38,7 +38,7 @@ class NaClValidationQueryContext {
 class NaClValidationQuery {
  public:
   // SHA256 digest size.
-  static const int kDigestLength = 32;
+  static const size_t kDigestLength = 32;
 
   NaClValidationQuery(NaClValidationDB* db, const std::string& profile_key);
 
@@ -77,7 +77,7 @@ class NaClValidationQuery {
   // code), so 4 times digest length means the buffer will not need to be
   // compressed as an intermediate step in the expected use cases.
   char buffer_[kDigestLength * 4];
-  int buffer_length_;
+  size_t buffer_length_;
 
   DISALLOW_COPY_AND_ASSIGN(NaClValidationQuery);
 };