Use the exact-width integer types defined in <stdint.h> rather than

net/cert/x509_certificate_unittest.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 "net/cert/x509_certificate.h"
 
-#include "base/basictypes.h"
+#include <stdint.h>
+
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/pickle.h"
 #include "base/sha1.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "crypto/rsa_private_key.h"
 #include "net/base/net_errors.h"
 #include "net/base/test_data_directory.h"
@@ skipping 22 matching lines @@
 //
 // For fingerprint
 // $ openssl x509 -inform DER -fingerprint -noout < /tmp/host.der
 
 // For valid_start, valid_expiry
 // $ openssl x509 -inform DER -text -noout < /tmp/host.der |
 //    grep -A 2 Validity
 // $ date +%s -d '<date str>'
 
 // Google's cert.
-uint8 google_fingerprint[] = {
+uint8_t google_fingerprint[] = {
   0xab, 0xbe, 0x5e, 0xb4, 0x93, 0x88, 0x4e, 0xe4, 0x60, 0xc6, 0xef, 0xf8,
   0xea, 0xd4, 0xb1, 0x55, 0x4b, 0xc9, 0x59, 0x3c
 };
 
 // webkit.org's cert.
-uint8 webkit_fingerprint[] = {
+uint8_t webkit_fingerprint[] = {
   0xa1, 0x4a, 0x94, 0x46, 0x22, 0x8e, 0x70, 0x66, 0x2b, 0x94, 0xf9, 0xf8,
   0x57, 0x83, 0x2d, 0xa2, 0xff, 0xbc, 0x84, 0xc2
 };
 
 // thawte.com's cert (it's EV-licious!).
-uint8 thawte_fingerprint[] = {
+uint8_t thawte_fingerprint[] = {
   0x85, 0x04, 0x2d, 0xfd, 0x2b, 0x0e, 0xc6, 0xc8, 0xaf, 0x2d, 0x77, 0xd6,
   0xa1, 0x3a, 0x64, 0x04, 0x27, 0x90, 0x97, 0x37
 };
 
 // A certificate for https://www.unosoft.hu/, whose AIA extension contains
 // an LDAP URL without a host name.
-uint8 unosoft_hu_fingerprint[] = {
+uint8_t unosoft_hu_fingerprint[] = {
   0x32, 0xff, 0xe3, 0xbe, 0x2c, 0x3b, 0xc7, 0xca, 0xbf, 0x2d, 0x64, 0xbd,
   0x25, 0x66, 0xf2, 0xec, 0x8b, 0x0f, 0xbf, 0xd8
 };
 
 // The fingerprint of the Google certificate used in the parsing tests,
 // which is newer than the one included in the x509_certificate_data.h
-uint8 google_parse_fingerprint[] = {
+uint8_t google_parse_fingerprint[] = {
   0x40, 0x50, 0x62, 0xe5, 0xbe, 0xfd, 0xe4, 0xaf, 0x97, 0xe9, 0x38, 0x2a,
   0xf1, 0x6c, 0xc8, 0x7c, 0x8f, 0xb7, 0xc4, 0xe2
 };
 
 // The fingerprint for the Thawte SGC certificate
-uint8 thawte_parse_fingerprint[] = {
+uint8_t thawte_parse_fingerprint[] = {
   0xec, 0x07, 0x10, 0x03, 0xd8, 0xf5, 0xa3, 0x7f, 0x42, 0xc4, 0x55, 0x7f,
   0x65, 0x6a, 0xae, 0x86, 0x65, 0xfa, 0x4b, 0x02
 };
 
 // Dec 18 00:00:00 2009 GMT
 const double kGoogleParseValidFrom = 1261094400;
 // Dec 18 23:59:59 2011 GMT
 const double kGoogleParseValidTo = 1324252799;
 
 void CheckGoogleCert(const scoped_refptr<X509Certificate>& google_cert,
-                     uint8* expected_fingerprint,
+                     uint8_t* expected_fingerprint,
                      double valid_from, double valid_to) {
   ASSERT_NE(static_cast<X509Certificate*>(NULL), google_cert.get());
 
   const CertPrincipal& subject = google_cert->subject();
   EXPECT_EQ("www.google.com", subject.common_name);
   EXPECT_EQ("Mountain View", subject.locality_name);
   EXPECT_EQ("California", subject.state_or_province_name);
   EXPECT_EQ("US", subject.country_name);
   EXPECT_EQ(0U, subject.street_addresses.size());
   ASSERT_EQ(1U, subject.organization_names.size());
@@ skipping 190 matching lines @@
   EXPECT_EQ("net_unittests", subject.organization_unit_names[0]);
   EXPECT_EQ("Chromium", subject.organization_unit_names[1]);
   EXPECT_EQ(0U, subject.domain_components.size());
 }
 
 TEST(X509CertificateTest, SerialNumbers) {
   scoped_refptr<X509Certificate> google_cert(
       X509Certificate::CreateFromBytes(
           reinterpret_cast<const char*>(google_der), sizeof(google_der)));
 
-  static const uint8 google_serial[16] = {
+  static const uint8_t google_serial[16] = {
     0x01,0x2a,0x39,0x76,0x0d,0x3f,0x4f,0xc9,
     0x0b,0xe7,0xbd,0x2b,0xcf,0x95,0x2e,0x7a,
   };
 
   ASSERT_EQ(sizeof(google_serial), google_cert->serial_number().size());
   EXPECT_TRUE(memcmp(google_cert->serial_number().data(), google_serial,
                      sizeof(google_serial)) == 0);
 
   // We also want to check a serial number where the first byte is >= 0x80 in
   // case the underlying library tries to pad it.
   scoped_refptr<X509Certificate> paypal_null_cert(
       X509Certificate::CreateFromBytes(
           reinterpret_cast<const char*>(paypal_null_der),
           sizeof(paypal_null_der)));
 
-  static const uint8 paypal_null_serial[3] = {0x00, 0xf0, 0x9b};
+  static const uint8_t paypal_null_serial[3] = {0x00, 0xf0, 0x9b};
   ASSERT_EQ(sizeof(paypal_null_serial),
             paypal_null_cert->serial_number().size());
   EXPECT_TRUE(memcmp(paypal_null_cert->serial_number().data(),
                      paypal_null_serial, sizeof(paypal_null_serial)) == 0);
 }
 
 TEST(X509CertificateTest, SHA256FingerprintsCorrectly) {
   scoped_refptr<X509Certificate> google_cert(X509Certificate::CreateFromBytes(
       reinterpret_cast<const char*>(google_der), sizeof(google_der)));
 
-  static const uint8 google_sha256_fingerprint[32] = {
+  static const uint8_t google_sha256_fingerprint[32] = {
       0x21, 0xaf, 0x58, 0x74, 0xea, 0x6b, 0xad, 0xbd, 0xe4, 0xb3, 0xb1,
       0xaa, 0x53, 0x32, 0x80, 0x8f, 0xbf, 0x8a, 0x24, 0x7d, 0x98, 0xec,
       0x7f, 0x77, 0x49, 0x38, 0x42, 0x81, 0x26, 0x7f, 0xed, 0x38};
 
   SHA256HashValue fingerprint =
       X509Certificate::CalculateFingerprint256(google_cert->os_cert_handle());
 
   for (size_t i = 0; i < 32; ++i)
     EXPECT_EQ(google_sha256_fingerprint[i], fingerprint.data[i]);
 }
@@ skipping 24 matching lines @@
   scoped_refptr<X509Certificate> cert_chain2 =
       X509Certificate::CreateFromHandle(server_cert->os_cert_handle(),
                                         intermediates);
 
   // No intermediate CA certicates.
   intermediates.clear();
   scoped_refptr<X509Certificate> cert_chain3 =
       X509Certificate::CreateFromHandle(server_cert->os_cert_handle(),
                                         intermediates);
 
-  static const uint8 cert_chain1_ca_fingerprint[20] = {
+  static const uint8_t cert_chain1_ca_fingerprint[20] = {
     0xc2, 0xf0, 0x08, 0x7d, 0x01, 0xe6, 0x86, 0x05, 0x3a, 0x4d,
     0x63, 0x3e, 0x7e, 0x70, 0xd4, 0xef, 0x65, 0xc2, 0xcc, 0x4f
   };
-  static const uint8 cert_chain2_ca_fingerprint[20] = {
+  static const uint8_t cert_chain2_ca_fingerprint[20] = {
     0xd5, 0x59, 0xa5, 0x86, 0x66, 0x9b, 0x08, 0xf4, 0x6a, 0x30,
     0xa1, 0x33, 0xf8, 0xa9, 0xed, 0x3d, 0x03, 0x8e, 0x2e, 0xa8
   };
   // The SHA-1 hash of nothing.
-  static const uint8 cert_chain3_ca_fingerprint[20] = {
+  static const uint8_t cert_chain3_ca_fingerprint[20] = {
     0xda, 0x39, 0xa3, 0xee, 0x5e, 0x6b, 0x4b, 0x0d, 0x32, 0x55,
     0xbf, 0xef, 0x95, 0x60, 0x18, 0x90, 0xaf, 0xd8, 0x07, 0x09
   };
   EXPECT_TRUE(memcmp(cert_chain1->ca_fingerprint().data,
                      cert_chain1_ca_fingerprint, 20) == 0);
   EXPECT_TRUE(memcmp(cert_chain2->ca_fingerprint().data,
                      cert_chain2_ca_fingerprint, 20) == 0);
   EXPECT_TRUE(memcmp(cert_chain3->ca_fingerprint().data,
                      cert_chain3_ca_fingerprint, 20) == 0);
 
   // Test the SHA-256 hash calculation functions explicitly since they are not
   // used by X509Certificate internally.
-  static const uint8 cert_chain1_ca_fingerprint_256[32] = {
+  static const uint8_t cert_chain1_ca_fingerprint_256[32] = {
     0x51, 0x15, 0x30, 0x49, 0x97, 0x54, 0xf8, 0xb4, 0x17, 0x41,
     0x6b, 0x58, 0x78, 0xb0, 0x89, 0xd2, 0xc3, 0xae, 0x66, 0xc1,
     0x16, 0x80, 0xa0, 0x78, 0xe7, 0x53, 0x45, 0xa2, 0xfb, 0x80,
     0xe1, 0x07
   };
-  static const uint8 cert_chain2_ca_fingerprint_256[32] = {
+  static const uint8_t cert_chain2_ca_fingerprint_256[32] = {
     0x00, 0xbd, 0x2b, 0x0e, 0xdd, 0x83, 0x40, 0xb1, 0x74, 0x6c,
     0xc3, 0x95, 0xc0, 0xe3, 0x55, 0xb2, 0x16, 0x58, 0x53, 0xfd,
     0xb9, 0x3c, 0x52, 0xda, 0xdd, 0xa8, 0x22, 0x8b, 0x07, 0x00,
     0x2d, 0xce
   };
   // The SHA-256 hash of nothing.
-  static const uint8 cert_chain3_ca_fingerprint_256[32] = {
+  static const uint8_t cert_chain3_ca_fingerprint_256[32] = {
     0xe3, 0xb0, 0xc4, 0x42, 0x98, 0xfc, 0x1c, 0x14, 0x9a, 0xfb,
     0xf4, 0xc8, 0x99, 0x6f, 0xb9, 0x24, 0x27, 0xae, 0x41, 0xe4,
     0x64, 0x9b, 0x93, 0x4c, 0xa4, 0x95, 0x99, 0x1b, 0x78, 0x52,
     0xb8, 0x55
   };
   SHA256HashValue ca_fingerprint_256_1 =
       X509Certificate::CalculateCAFingerprint256(
           cert_chain1->GetIntermediateCertificates());
   SHA256HashValue ca_fingerprint_256_2 =
       X509Certificate::CalculateCAFingerprint256(
           cert_chain2->GetIntermediateCertificates());
   SHA256HashValue ca_fingerprint_256_3 =
       X509Certificate::CalculateCAFingerprint256(
           cert_chain3->GetIntermediateCertificates());
   EXPECT_TRUE(memcmp(ca_fingerprint_256_1.data,
                      cert_chain1_ca_fingerprint_256, 32) == 0);
   EXPECT_TRUE(memcmp(ca_fingerprint_256_2.data,
                      cert_chain2_ca_fingerprint_256, 32) == 0);
   EXPECT_TRUE(memcmp(ca_fingerprint_256_3.data,
                      cert_chain3_ca_fingerprint_256, 32) == 0);
 
-  static const uint8 cert_chain1_chain_fingerprint_256[32] = {
+  static const uint8_t cert_chain1_chain_fingerprint_256[32] = {
     0xac, 0xff, 0xcc, 0x63, 0x0d, 0xd0, 0xa7, 0x19, 0x78, 0xb5,
     0x8a, 0x47, 0x8b, 0x67, 0x97, 0xcb, 0x8d, 0xe1, 0x6a, 0x8a,
     0x57, 0x70, 0xda, 0x9a, 0x53, 0x72, 0xe2, 0xa0, 0x08, 0xab,
     0xcc, 0x8f
   };
-  static const uint8 cert_chain2_chain_fingerprint_256[32] = {
+  static const uint8_t cert_chain2_chain_fingerprint_256[32] = {
     0x67, 0x3a, 0x11, 0x20, 0xd6, 0x94, 0x14, 0xe4, 0x16, 0x9f,
     0x58, 0xe2, 0x8b, 0xf7, 0x27, 0xed, 0xbb, 0xe8, 0xa7, 0xff,
     0x1c, 0x8c, 0x0f, 0x21, 0x38, 0x16, 0x7c, 0xad, 0x1f, 0x22,
     0x6f, 0x9b
   };
-  static const uint8 cert_chain3_chain_fingerprint_256[32] = {
+  static const uint8_t cert_chain3_chain_fingerprint_256[32] = {
     0x16, 0x7a, 0xbd, 0xb4, 0x57, 0x04, 0x65, 0x3c, 0x3b, 0xef,
     0x6e, 0x6a, 0xa6, 0x02, 0x73, 0x30, 0x3e, 0x34, 0x1b, 0x43,
     0xc2, 0x7c, 0x98, 0x52, 0x9f, 0x34, 0x7f, 0x55, 0x97, 0xe9,
     0x1a, 0x10
   };
   SHA256HashValue chain_fingerprint_256_1 =
       X509Certificate::CalculateChainFingerprint256(
           cert_chain1->os_cert_handle(),
           cert_chain1->GetIntermediateCertificates());
   SHA256HashValue chain_fingerprint_256_2 =
@@ skipping 23 matching lines @@
   std::vector<std::string> ip_addresses;
   san_cert->GetSubjectAltName(&dns_names, &ip_addresses);
 
   // Ensure that DNS names are correctly parsed.
   ASSERT_EQ(1U, dns_names.size());
   EXPECT_EQ("test.example", dns_names[0]);
 
   // Ensure that both IPv4 and IPv6 addresses are correctly parsed.
   ASSERT_EQ(2U, ip_addresses.size());
 
-  static const uint8 kIPv4Address[] = {
+  static const uint8_t kIPv4Address[] = {
       0x7F, 0x00, 0x00, 0x02
   };
   ASSERT_EQ(arraysize(kIPv4Address), ip_addresses[0].size());
   EXPECT_EQ(0, memcmp(ip_addresses[0].data(), kIPv4Address,
                       arraysize(kIPv4Address)));
 
-  static const uint8 kIPv6Address[] = {
+  static const uint8_t kIPv6Address[] = {
       0xFE, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01
   };
   ASSERT_EQ(arraysize(kIPv6Address), ip_addresses[1].size());
   EXPECT_EQ(0, memcmp(ip_addresses[1].data(), kIPv6Address,
                       arraysize(kIPv6Address)));
 
   // Ensure the subjectAltName dirName has not influenced the handling of
   // the subject commonName.
   EXPECT_EQ("127.0.0.1", san_cert->subject().common_name);
 }
 
 TEST(X509CertificateTest, ExtractSPKIFromDERCert) {
   base::FilePath certs_dir = GetTestCertsDirectory();
   scoped_refptr<X509Certificate> cert =
       ImportCertFromFile(certs_dir, "nist.der");
   ASSERT_NE(static_cast<X509Certificate*>(NULL), cert.get());
 
   std::string derBytes;
   EXPECT_TRUE(X509Certificate::GetDEREncoded(cert->os_cert_handle(),
                                              &derBytes));
 
   base::StringPiece spkiBytes;
   EXPECT_TRUE(asn1::ExtractSPKIFromDERCert(derBytes, &spkiBytes));
 
-  uint8 hash[base::kSHA1Length];
-  base::SHA1HashBytes(reinterpret_cast<const uint8*>(spkiBytes.data()),
+  uint8_t hash[base::kSHA1Length];
+  base::SHA1HashBytes(reinterpret_cast<const uint8_t*>(spkiBytes.data()),
                       spkiBytes.size(), hash);
 
   EXPECT_EQ(0, memcmp(hash, kNistSPKIHash, sizeof(hash)));
 }
 
 TEST(X509CertificateTest, ExtractCRLURLsFromDERCert) {
   base::FilePath certs_dir = GetTestCertsDirectory();
   scoped_refptr<X509Certificate> cert =
       ImportCertFromFile(certs_dir, "nist.der");
   ASSERT_NE(static_cast<X509Certificate*>(NULL), cert.get());
@@ skipping 272 matching lines @@
 
   std::string nickname = test_cert->GetDefaultNickname(USER_CERT);
   EXPECT_EQ("wtc@google.com's COMODO Client Authentication and "
             "Secure Email CA ID", nickname);
 }
 #endif
 
 const struct CertificateFormatTestData {
   const char* file_name;
   X509Certificate::Format format;
-  uint8* chain_fingerprints[3];
+  uint8_t* chain_fingerprints[3];
 } kFormatTestData[] = {
   // DER Parsing - single certificate, DER encoded
   { "google.single.der", X509Certificate::FORMAT_SINGLE_CERTIFICATE,
     { google_parse_fingerprint,
       NULL, } },
   // DER parsing - single certificate, PEM encoded
   { "google.single.pem", X509Certificate::FORMAT_SINGLE_CERTIFICATE,
     { google_parse_fingerprint,
       NULL, } },
   // PEM parsing - single certificate, PEM encoded with a PEB of
@@ skipping 79 matching lines @@
       break;
     }
 
     // A cert is expected - make sure that one was parsed.
     ASSERT_LT(i, certs.size());
 
     // Compare the parsed certificate with the expected certificate, by
     // comparing fingerprints.
     const X509Certificate* cert = certs[i].get();
     const SHA1HashValue& actual_fingerprint = cert->fingerprint();
-    uint8* expected_fingerprint = test_data_.chain_fingerprints[i];
+    uint8_t* expected_fingerprint = test_data_.chain_fingerprints[i];
 
     for (size_t j = 0; j < 20; ++j)
       EXPECT_EQ(expected_fingerprint[j], actual_fingerprint.data[j]);
   }
 }
 
 INSTANTIATE_TEST_CASE_P(, X509CertificateParseTest,
                         testing::ValuesIn(kFormatTestData));
 
 struct CertificateNameVerifyTestData {
@@ skipping 187 matching lines @@
   if (test_data.ip_addrs) {
     // Build up the certificate IP address list.
     std::string ip_addrs_line(test_data.ip_addrs);
     std::vector<std::string> ip_addressses_ascii;
     base::SplitString(ip_addrs_line, ',', &ip_addressses_ascii);
     for (size_t i = 0; i < ip_addressses_ascii.size(); ++i) {
       std::string& addr_ascii = ip_addressses_ascii[i];
       ASSERT_NE(0U, addr_ascii.length());
       if (addr_ascii[0] == 'x') {  // Hex encoded address
         addr_ascii.erase(0, 1);
-        std::vector<uint8> bytes;
+        std::vector<uint8_t> bytes;
         EXPECT_TRUE(base::HexStringToBytes(addr_ascii, &bytes))
             << "Could not parse hex address " << addr_ascii << " i = " << i;
         ip_addressses.push_back(std::string(reinterpret_cast<char*>(&bytes[0]),
                                             bytes.size()));
         ASSERT_EQ(16U, ip_addressses.back().size()) << i;
       } else {  // Decimal groups
         std::vector<std::string> decimals_ascii;
         base::SplitString(addr_ascii, '.', &decimals_ascii);
         EXPECT_EQ(4U, decimals_ascii.size()) << i;
         std::string addr_bytes;
@@ skipping 69 matching lines @@
                                     &actual_type);
 
   EXPECT_EQ(data.expected_bits, actual_bits);
   EXPECT_EQ(data.expected_type, actual_type);
 }
 
 INSTANTIATE_TEST_CASE_P(, X509CertificatePublicKeyInfoTest,
                         testing::ValuesIn(kPublicKeyInfoTestData));
 
 }  // namespace net