diff options
author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-28 21:15:27 +0000 |
---|---|---|
committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-28 21:15:27 +0000 |
commit | b13b9bdddf305f4992a97508a757600f40232faa (patch) | |
tree | 0649e1056f6e6c67921c7104ec406665c5c2b224 /base/sha1_unittest.cc | |
parent | 927c151d93c1d458dc8e92e4b4dcb07874a0c436 (diff) | |
download | chromium_src-b13b9bdddf305f4992a97508a757600f40232faa.zip chromium_src-b13b9bdddf305f4992a97508a757600f40232faa.tar.gz chromium_src-b13b9bdddf305f4992a97508a757600f40232faa.tar.bz2 |
Update SHA1_LENGTH -> kSHA1Length to match previous change to SHA256_LENGTH.
(I didn't try and understand or fix why kSHA1Length is in base:: while kSHA256Length is in crypto::.)
BUG=92247
TEST=compiles
Review URL: http://codereview.chromium.org/7972024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103179 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/sha1_unittest.cc')
-rw-r--r-- | base/sha1_unittest.cc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/base/sha1_unittest.cc b/base/sha1_unittest.cc index 406150b..b29fe46 100644 --- a/base/sha1_unittest.cc +++ b/base/sha1_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -20,7 +20,7 @@ TEST(SHA1Test, Test1) { 0x9c, 0xd0, 0xd8, 0x9d }; std::string output = base::SHA1HashString(input); - for (size_t i = 0; i < base::SHA1_LENGTH; i++) + for (size_t i = 0; i < base::kSHA1Length; i++) EXPECT_EQ(expected[i], output[i] & 0xFF); } @@ -36,7 +36,7 @@ TEST(SHA1Test, Test2) { 0xe5, 0x46, 0x70, 0xf1 }; std::string output = base::SHA1HashString(input); - for (size_t i = 0; i < base::SHA1_LENGTH; i++) + for (size_t i = 0; i < base::kSHA1Length; i++) EXPECT_EQ(expected[i], output[i] & 0xFF); } @@ -51,14 +51,14 @@ TEST(SHA1Test, Test3) { 0x65, 0x34, 0x01, 0x6f }; std::string output = base::SHA1HashString(input); - for (size_t i = 0; i < base::SHA1_LENGTH; i++) + for (size_t i = 0; i < base::kSHA1Length; i++) EXPECT_EQ(expected[i], output[i] & 0xFF); } TEST(SHA1Test, Test1Bytes) { // Example A.1 from FIPS 180-2: one-block message. std::string input = "abc"; - unsigned char output[base::SHA1_LENGTH]; + unsigned char output[base::kSHA1Length]; unsigned char expected[] = { 0xa9, 0x99, 0x3e, 0x36, 0x47, 0x06, 0x81, 0x6a, @@ -68,7 +68,7 @@ TEST(SHA1Test, Test1Bytes) { base::SHA1HashBytes(reinterpret_cast<const unsigned char*>(input.c_str()), input.length(), output); - for (size_t i = 0; i < base::SHA1_LENGTH; i++) + for (size_t i = 0; i < base::kSHA1Length; i++) EXPECT_EQ(expected[i], output[i]); } @@ -76,7 +76,7 @@ TEST(SHA1Test, Test2Bytes) { // Example A.2 from FIPS 180-2: multi-block message. std::string input = "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"; - unsigned char output[base::SHA1_LENGTH]; + unsigned char output[base::kSHA1Length]; unsigned char expected[] = { 0x84, 0x98, 0x3e, 0x44, 0x1c, 0x3b, 0xd2, 0x6e, @@ -86,14 +86,14 @@ TEST(SHA1Test, Test2Bytes) { base::SHA1HashBytes(reinterpret_cast<const unsigned char*>(input.c_str()), input.length(), output); - for (size_t i = 0; i < base::SHA1_LENGTH; i++) + for (size_t i = 0; i < base::kSHA1Length; i++) EXPECT_EQ(expected[i], output[i]); } TEST(SHA1Test, Test3Bytes) { // Example A.3 from FIPS 180-2: long message. std::string input(1000000, 'a'); - unsigned char output[base::SHA1_LENGTH]; + unsigned char output[base::kSHA1Length]; unsigned char expected[] = { 0x34, 0xaa, 0x97, 0x3c, 0xd4, 0xc4, 0xda, 0xa4, @@ -103,6 +103,6 @@ TEST(SHA1Test, Test3Bytes) { base::SHA1HashBytes(reinterpret_cast<const unsigned char*>(input.c_str()), input.length(), output); - for (size_t i = 0; i < base::SHA1_LENGTH; i++) + for (size_t i = 0; i < base::kSHA1Length; i++) EXPECT_EQ(expected[i], output[i]); } |