| Index: crypto/ec_private_key_unittest.cc
|
| diff --git a/crypto/ec_private_key_unittest.cc b/crypto/ec_private_key_unittest.cc
|
| index 57af82ec6222f16015099a606c8264c9fef4064b..95bd1a3f0c4c7ba3484247614b2a9a4874fe3d2b 100644
|
| --- a/crypto/ec_private_key_unittest.cc
|
| +++ b/crypto/ec_private_key_unittest.cc
|
| @@ -26,12 +26,8 @@ TEST(ECPrivateKeyUnitTest, InitRandomTest) {
|
|
|
| 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));
|
| + EXPECT_TRUE(keypair1->ExportValueForTesting(&key1value));
|
| + EXPECT_TRUE(keypair2->ExportValueForTesting(&key2value));
|
|
|
| std::vector<uint8_t> privkey1;
|
| std::vector<uint8_t> privkey2;
|
| @@ -57,17 +53,11 @@ TEST(ECPrivateKeyUnitTest, InitRandomTest) {
|
|
|
| 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_TRUE(keypair3->ExportValueForTesting(&key3value));
|
| + EXPECT_TRUE(keypair4->ExportValueForTesting(&key4value));
|
|
|
| EXPECT_EQ(key1value, key3value);
|
| EXPECT_EQ(key2value, key4value);
|
| - EXPECT_EQ(key1params, key3params);
|
| - EXPECT_EQ(key2params, key4params);
|
|
|
| std::vector<uint8_t> pubkey3;
|
| std::vector<uint8_t> pubkey4;
|
| @@ -92,16 +82,10 @@ TEST(ECPrivateKeyUnitTest, Copy) {
|
|
|
| std::vector<uint8_t> key1value;
|
| std::vector<uint8_t> key2value;
|
| - EXPECT_TRUE(keypair1->ExportValue(&key1value));
|
| - EXPECT_TRUE(keypair2->ExportValue(&key2value));
|
| + EXPECT_TRUE(keypair1->ExportValueForTesting(&key1value));
|
| + EXPECT_TRUE(keypair2->ExportValueForTesting(&key2value));
|
| EXPECT_EQ(key1value, key2value);
|
|
|
| - 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_t> pubkey1;
|
| std::vector<uint8_t> pubkey2;
|
| EXPECT_TRUE(keypair1->ExportPublicKey(&pubkey1));
|
|
|