Index: crypto/sha2_unittest.cc |
diff --git a/crypto/sha2_unittest.cc b/crypto/sha2_unittest.cc |
index 78da1360d4daab5bbd9c4e3ccfc869b1586345c3..27d6d25508cb71b63a45234fd803db74a273b371 100644 |
--- a/crypto/sha2_unittest.cc |
+++ b/crypto/sha2_unittest.cc |
@@ -4,7 +4,9 @@ |
#include "crypto/sha2.h" |
-#include "base/basictypes.h" |
+#include <stddef.h> |
+#include <stdint.h> |
+ |
#include "testing/gtest/include/gtest/gtest.h" |
TEST(Sha256Test, Test1) { |
@@ -19,12 +21,12 @@ TEST(Sha256Test, Test1) { |
0xb4, 0x10, 0xff, 0x61, |
0xf2, 0x00, 0x15, 0xad }; |
- uint8 output1[crypto::kSHA256Length]; |
+ uint8_t output1[crypto::kSHA256Length]; |
crypto::SHA256HashString(input1, output1, sizeof(output1)); |
for (size_t i = 0; i < crypto::kSHA256Length; i++) |
EXPECT_EQ(expected1[i], static_cast<int>(output1[i])); |
- uint8 output_truncated1[4]; // 4 bytes == 32 bits |
+ uint8_t output_truncated1[4]; // 4 bytes == 32 bits |
crypto::SHA256HashString(input1, |
output_truncated1, sizeof(output_truncated1)); |
for (size_t i = 0; i < sizeof(output_truncated1); i++) |
@@ -47,7 +49,7 @@ TEST(Sha256Test, Test1_String) { |
std::string output1 = crypto::SHA256HashString(input1); |
ASSERT_EQ(crypto::kSHA256Length, output1.size()); |
for (size_t i = 0; i < crypto::kSHA256Length; i++) |
- EXPECT_EQ(expected1[i], static_cast<uint8>(output1[i])); |
+ EXPECT_EQ(expected1[i], static_cast<uint8_t>(output1[i])); |
} |
TEST(Sha256Test, Test2) { |
@@ -63,12 +65,12 @@ TEST(Sha256Test, Test2) { |
0xf6, 0xec, 0xed, 0xd4, |
0x19, 0xdb, 0x06, 0xc1 }; |
- uint8 output2[crypto::kSHA256Length]; |
+ uint8_t output2[crypto::kSHA256Length]; |
crypto::SHA256HashString(input2, output2, sizeof(output2)); |
for (size_t i = 0; i < crypto::kSHA256Length; i++) |
EXPECT_EQ(expected2[i], static_cast<int>(output2[i])); |
- uint8 output_truncated2[6]; |
+ uint8_t output_truncated2[6]; |
crypto::SHA256HashString(input2, |
output_truncated2, sizeof(output_truncated2)); |
for (size_t i = 0; i < sizeof(output_truncated2); i++) |
@@ -87,12 +89,12 @@ TEST(Sha256Test, Test3) { |
0x04, 0x6d, 0x39, 0xcc, |
0xc7, 0x11, 0x2c, 0xd0 }; |
- uint8 output3[crypto::kSHA256Length]; |
+ uint8_t output3[crypto::kSHA256Length]; |
crypto::SHA256HashString(input3, output3, sizeof(output3)); |
for (size_t i = 0; i < crypto::kSHA256Length; i++) |
EXPECT_EQ(expected3[i], static_cast<int>(output3[i])); |
- uint8 output_truncated3[12]; |
+ uint8_t output_truncated3[12]; |
crypto::SHA256HashString(input3, |
output_truncated3, sizeof(output_truncated3)); |
for (size_t i = 0; i < sizeof(output_truncated3); i++) |