Switch to standard integer types in crypto/.

crypto/ec_private_key_unittest.cc

 // 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.
 
 #include "crypto/ec_private_key.h"
 
+#include <stdint.h>
+
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 // Generate random private keys. Export, then re-import. We should get
 // back the same exact public key, and the private key should have the same
 // value and elliptic curve params.
 TEST(ECPrivateKeyUnitTest, InitRandomTest) {
   const std::string password1;
   const std::string password2 = "test";
 
   scoped_ptr<crypto::ECPrivateKey> keypair1(crypto::ECPrivateKey::Create());
   scoped_ptr<crypto::ECPrivateKey> keypair2(crypto::ECPrivateKey::Create());
   ASSERT_TRUE(keypair1.get());
   ASSERT_TRUE(keypair2.get());
 
-  std::vector<uint8> key1value;
-  std::vector<uint8> key2value;
-  std::vector<uint8> key1params;
-  std::vector<uint8> key2params;
+  std::vector<uint8_t> key1value;
+  std::vector<uint8_t> key2value;
+  std::vector<uint8_t> key1params;
+  std::vector<uint8_t> key2params;
   EXPECT_TRUE(keypair1->ExportValue(&key1value));
   EXPECT_TRUE(keypair2->ExportValue(&key2value));
   EXPECT_TRUE(keypair1->ExportECParams(&key1params));
   EXPECT_TRUE(keypair2->ExportECParams(&key2params));
 
-  std::vector<uint8> privkey1;
-  std::vector<uint8> privkey2;
-  std::vector<uint8> pubkey1;
-  std::vector<uint8> pubkey2;
+  std::vector<uint8_t> privkey1;
+  std::vector<uint8_t> privkey2;
+  std::vector<uint8_t> pubkey1;
+  std::vector<uint8_t> pubkey2;
   std::string raw_pubkey1;
   std::string raw_pubkey2;
   ASSERT_TRUE(keypair1->ExportEncryptedPrivateKey(password1, 1, &privkey1));
   ASSERT_TRUE(keypair2->ExportEncryptedPrivateKey(password2, 1, &privkey2));
   EXPECT_TRUE(keypair1->ExportPublicKey(&pubkey1));
   EXPECT_TRUE(keypair2->ExportPublicKey(&pubkey2));
   EXPECT_TRUE(keypair1->ExportRawPublicKey(&raw_pubkey1));
   EXPECT_TRUE(keypair2->ExportRawPublicKey(&raw_pubkey2));
 
   scoped_ptr<crypto::ECPrivateKey> keypair3(
       crypto::ECPrivateKey::CreateFromEncryptedPrivateKeyInfo(
           password1, privkey1, pubkey1));
   scoped_ptr<crypto::ECPrivateKey> keypair4(
       crypto::ECPrivateKey::CreateFromEncryptedPrivateKeyInfo(
           password2, privkey2, pubkey2));
   ASSERT_TRUE(keypair3.get());
   ASSERT_TRUE(keypair4.get());
 
-  std::vector<uint8> key3value;
-  std::vector<uint8> key4value;
-  std::vector<uint8> key3params;
-  std::vector<uint8> key4params;
+  std::vector<uint8_t> key3value;
+  std::vector<uint8_t> key4value;
+  std::vector<uint8_t> key3params;
+  std::vector<uint8_t> key4params;
   EXPECT_TRUE(keypair3->ExportValue(&key3value));
   EXPECT_TRUE(keypair4->ExportValue(&key4value));
   EXPECT_TRUE(keypair3->ExportECParams(&key3params));
   EXPECT_TRUE(keypair4->ExportECParams(&key4params));
 
   EXPECT_EQ(key1value, key3value);
   EXPECT_EQ(key2value, key4value);
   EXPECT_EQ(key1params, key3params);
   EXPECT_EQ(key2params, key4params);
 
-  std::vector<uint8> pubkey3;
-  std::vector<uint8> pubkey4;
+  std::vector<uint8_t> pubkey3;
+  std::vector<uint8_t> pubkey4;
   std::string raw_pubkey3;
   std::string raw_pubkey4;
   EXPECT_TRUE(keypair3->ExportPublicKey(&pubkey3));
   EXPECT_TRUE(keypair4->ExportPublicKey(&pubkey4));
   EXPECT_TRUE(keypair3->ExportRawPublicKey(&raw_pubkey3));
   EXPECT_TRUE(keypair4->ExportRawPublicKey(&raw_pubkey4));
 
   EXPECT_EQ(pubkey1, pubkey3);
   EXPECT_EQ(pubkey2, pubkey4);
   EXPECT_EQ(raw_pubkey1, raw_pubkey3);
   EXPECT_EQ(raw_pubkey2, raw_pubkey4);
 }
 
 TEST(ECPrivateKeyUnitTest, Copy) {
   scoped_ptr<crypto::ECPrivateKey> keypair1(crypto::ECPrivateKey::Create());
   scoped_ptr<crypto::ECPrivateKey> keypair2(keypair1->Copy());
   ASSERT_TRUE(keypair1.get());
   ASSERT_TRUE(keypair2.get());
 
-  std::vector<uint8> key1value;
-  std::vector<uint8> key2value;
+  std::vector<uint8_t> key1value;
+  std::vector<uint8_t> key2value;
   EXPECT_TRUE(keypair1->ExportValue(&key1value));
   EXPECT_TRUE(keypair2->ExportValue(&key2value));
   EXPECT_EQ(key1value, key2value);
 
-  std::vector<uint8> key1params;
-  std::vector<uint8> key2params;
+  std::vector<uint8_t> key1params;
+  std::vector<uint8_t> key2params;
   EXPECT_TRUE(keypair1->ExportECParams(&key1params));
   EXPECT_TRUE(keypair2->ExportECParams(&key2params));
   EXPECT_EQ(key1params, key2params);
 
-  std::vector<uint8> pubkey1;
-  std::vector<uint8> pubkey2;
+  std::vector<uint8_t> pubkey1;
+  std::vector<uint8_t> pubkey2;
   EXPECT_TRUE(keypair1->ExportPublicKey(&pubkey1));
   EXPECT_TRUE(keypair2->ExportPublicKey(&pubkey2));
   EXPECT_EQ(pubkey1, pubkey2);
 
   std::string raw_pubkey1;
   std::string raw_pubkey2;
   EXPECT_TRUE(keypair1->ExportRawPublicKey(&raw_pubkey1));
   EXPECT_TRUE(keypair2->ExportRawPublicKey(&raw_pubkey2));
   EXPECT_EQ(raw_pubkey1, raw_pubkey2);
 }
 
 TEST(ECPrivateKeyUnitTest, BadPasswordTest) {
   const std::string password1;
   const std::string password2 = "test";
 
   scoped_ptr<crypto::ECPrivateKey> keypair1(
       crypto::ECPrivateKey::Create());
   ASSERT_TRUE(keypair1.get());
 
-  std::vector<uint8> privkey1;
-  std::vector<uint8> pubkey1;
+  std::vector<uint8_t> privkey1;
+  std::vector<uint8_t> pubkey1;
   ASSERT_TRUE(keypair1->ExportEncryptedPrivateKey(
       password1, 1, &privkey1));
   ASSERT_TRUE(keypair1->ExportPublicKey(&pubkey1));
 
   scoped_ptr<crypto::ECPrivateKey> keypair2(
       crypto::ECPrivateKey::CreateFromEncryptedPrivateKeyInfo(
           password2, privkey1, pubkey1));
   ASSERT_FALSE(keypair2.get());
 }
 
@@ skipping 20 matching lines @@
       0x01, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03,
       0x42, 0x00, 0x04, 0x85, 0x92, 0x9e, 0x95, 0x5c, 0x6b, 0x9e, 0xd6, 0x1e,
       0xb8, 0x64, 0xea, 0xc2, 0xb3, 0xef, 0x18, 0xed, 0x3a, 0x5e, 0xc4, 0x5c,
       0x15, 0x37, 0x6a, 0xe9, 0xaa, 0x0b, 0x34, 0x03, 0xfd, 0xca, 0x83, 0x0f,
       0xd7, 0x5c, 0x5d, 0xc5, 0x53, 0x6e, 0xe5, 0xa9, 0x33, 0xd5, 0xcc, 0xab,
       0x53, 0x78, 0xdd, 0xd6, 0x12, 0x3a, 0x5e, 0xeb, 0xbf, 0xdf, 0x16, 0xd3,
       0x2c, 0x3b, 0xe8, 0xdb, 0x19, 0xfc, 0x5e};
 
   scoped_ptr<crypto::ECPrivateKey> keypair_nss(
       crypto::ECPrivateKey::CreateFromEncryptedPrivateKeyInfo(
-          "",
-          std::vector<uint8>(nss_key, nss_key + arraysize(nss_key)),
-          std::vector<uint8>(nss_pub_key,
-                             nss_pub_key + arraysize(nss_pub_key))));
+          "", std::vector<uint8_t>(nss_key, nss_key + arraysize(nss_key)),
+          std::vector<uint8_t>(nss_pub_key,
+                               nss_pub_key + arraysize(nss_pub_key))));
 
   EXPECT_TRUE(keypair_nss.get());
 }
 
 // Although the plan is to transition from OpenSSL to NSS, ensure NSS can import
 // OpenSSL's format so that it is possible to rollback.
 TEST(ECPrivateKeyUnitTest, LoadOpenSSLKeyTest) {
   static const unsigned char openssl_key[] = {
       0x30, 0x81, 0xb0, 0x30, 0x1b, 0x06, 0x0a, 0x2a, 0x86, 0x48, 0x86, 0xf7,
       0x0d, 0x01, 0x0c, 0x01, 0x03, 0x30, 0x0d, 0x04, 0x08, 0xb2, 0xfe, 0x68,
@@ skipping 15 matching lines @@
       0x01, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03,
       0x42, 0x00, 0x04, 0xb9, 0xda, 0x0d, 0x71, 0x60, 0xb3, 0x63, 0x28, 0x22,
       0x67, 0xe7, 0xe0, 0xa3, 0xf8, 0x00, 0x8e, 0x4c, 0x89, 0xed, 0x31, 0x34,
       0xf6, 0xdb, 0xc4, 0xfe, 0x0b, 0x5d, 0xe1, 0x11, 0x39, 0x49, 0xa6, 0x50,
       0xa8, 0xe3, 0x4a, 0xc0, 0x40, 0x88, 0xb8, 0x38, 0x3f, 0x56, 0xfb, 0x33,
       0x8d, 0xd4, 0x64, 0x91, 0xd6, 0x15, 0x77, 0x42, 0x27, 0xc5, 0xaa, 0x44,
       0xff, 0xab, 0x4d, 0xb5, 0x7e, 0x25, 0x3d};
 
   scoped_ptr<crypto::ECPrivateKey> keypair_openssl(
       crypto::ECPrivateKey::CreateFromEncryptedPrivateKeyInfo(
-          "",
-          std::vector<uint8>(openssl_key, openssl_key + arraysize(openssl_key)),
-          std::vector<uint8>(openssl_pub_key,
-                             openssl_pub_key + arraysize(openssl_pub_key))));
+          "", std::vector<uint8_t>(openssl_key,
+                                   openssl_key + arraysize(openssl_key)),
+          std::vector<uint8_t>(openssl_pub_key,
+                               openssl_pub_key + arraysize(openssl_pub_key))));
 
   EXPECT_TRUE(keypair_openssl.get());
 }
 
 // The Android code writes out Channel IDs differently from the NSS
 // implementation; the empty password is converted to "\0\0". The OpenSSL port
 // should support either.
 #if defined(USE_OPENSSL)
 TEST(ECPrivateKeyUnitTest, LoadOldOpenSSLKeyTest) {
   static const unsigned char openssl_key[] = {
@@ skipping 58 matching lines @@
       0xa7, 0x17, 0x9e, 0x84, 0xf3, 0xb9, 0xca, 0xc2, 0xfc, 0x63, 0x25, 0x51,
       0x02, 0x01, 0x01, 0x03, 0x42, 0x00, 0x04, 0xde, 0x09, 0x08, 0x07, 0x03,
       0x2e, 0x8f, 0x37, 0x9a, 0xd5, 0xad, 0xe5, 0xc6, 0x9d, 0xd4, 0x63, 0xc7,
       0x4a, 0xe7, 0x20, 0xcb, 0x90, 0xa0, 0x1f, 0x18, 0x18, 0x72, 0xb5, 0x21,
       0x88, 0x38, 0xc0, 0xdb, 0xba, 0xf6, 0x99, 0xd8, 0xa5, 0x3b, 0x83, 0xe9,
       0xe3, 0xd5, 0x61, 0x99, 0x73, 0x42, 0xc6, 0x6c, 0xe8, 0x0a, 0x95, 0x40,
       0x41, 0x3b, 0x0d, 0x10, 0xa7, 0x4a, 0x93, 0xdb, 0x5a, 0xe7, 0xec};
 
   scoped_ptr<crypto::ECPrivateKey> keypair_openssl(
       crypto::ECPrivateKey::CreateFromEncryptedPrivateKeyInfo(
-          "",
-          std::vector<uint8>(openssl_key, openssl_key + arraysize(openssl_key)),
-          std::vector<uint8>(openssl_pub_key,
-                             openssl_pub_key + arraysize(openssl_pub_key))));
+          "", std::vector<uint8_t>(openssl_key,
+                                   openssl_key + arraysize(openssl_key)),
+          std::vector<uint8_t>(openssl_pub_key,
+                               openssl_pub_key + arraysize(openssl_pub_key))));
 
   EXPECT_TRUE(keypair_openssl.get());
 }
 #endif  // defined(USE_OPENSSL)