| Index: crypto/symmetric_key_unittest.cc
|
| diff --git a/crypto/symmetric_key_unittest.cc b/crypto/symmetric_key_unittest.cc
|
| index 468759b0423c7680779f7b61e207f3ebb0f97fe2..d954761d75a561efe5203e697f0576b37da3df9c 100644
|
| --- a/crypto/symmetric_key_unittest.cc
|
| +++ b/crypto/symmetric_key_unittest.cc
|
| @@ -14,7 +14,7 @@
|
| TEST(SymmetricKeyTest, GenerateRandomKey) {
|
| std::unique_ptr<crypto::SymmetricKey> key(
|
| crypto::SymmetricKey::GenerateRandomKey(crypto::SymmetricKey::AES, 256));
|
| - ASSERT_TRUE(NULL != key.get());
|
| + ASSERT_TRUE(key);
|
| std::string raw_key;
|
| EXPECT_TRUE(key->GetRawKey(&raw_key));
|
| EXPECT_EQ(32U, raw_key.size());
|
| @@ -23,7 +23,7 @@ TEST(SymmetricKeyTest, GenerateRandomKey) {
|
| // (Note: this has a one-in-10^77 chance of failure!)
|
| std::unique_ptr<crypto::SymmetricKey> key2(
|
| crypto::SymmetricKey::GenerateRandomKey(crypto::SymmetricKey::AES, 256));
|
| - ASSERT_TRUE(NULL != key2.get());
|
| + ASSERT_TRUE(key2);
|
| std::string raw_key2;
|
| EXPECT_TRUE(key2->GetRawKey(&raw_key2));
|
| EXPECT_EQ(32U, raw_key2.size());
|
| @@ -33,13 +33,13 @@ TEST(SymmetricKeyTest, GenerateRandomKey) {
|
| TEST(SymmetricKeyTest, ImportGeneratedKey) {
|
| std::unique_ptr<crypto::SymmetricKey> key1(
|
| crypto::SymmetricKey::GenerateRandomKey(crypto::SymmetricKey::AES, 256));
|
| - ASSERT_TRUE(NULL != key1.get());
|
| + ASSERT_TRUE(key1);
|
| std::string raw_key1;
|
| EXPECT_TRUE(key1->GetRawKey(&raw_key1));
|
|
|
| std::unique_ptr<crypto::SymmetricKey> key2(
|
| crypto::SymmetricKey::Import(crypto::SymmetricKey::AES, raw_key1));
|
| - ASSERT_TRUE(NULL != key2.get());
|
| + ASSERT_TRUE(key2);
|
|
|
| std::string raw_key2;
|
| EXPECT_TRUE(key2->GetRawKey(&raw_key2));
|
| @@ -51,13 +51,13 @@ TEST(SymmetricKeyTest, ImportDerivedKey) {
|
| std::unique_ptr<crypto::SymmetricKey> key1(
|
| crypto::SymmetricKey::DeriveKeyFromPassword(
|
| crypto::SymmetricKey::HMAC_SHA1, "password", "somesalt", 1024, 160));
|
| - ASSERT_TRUE(NULL != key1.get());
|
| + ASSERT_TRUE(key1);
|
| std::string raw_key1;
|
| EXPECT_TRUE(key1->GetRawKey(&raw_key1));
|
|
|
| std::unique_ptr<crypto::SymmetricKey> key2(
|
| crypto::SymmetricKey::Import(crypto::SymmetricKey::HMAC_SHA1, raw_key1));
|
| - ASSERT_TRUE(NULL != key2.get());
|
| + ASSERT_TRUE(key2);
|
|
|
| std::string raw_key2;
|
| EXPECT_TRUE(key2->GetRawKey(&raw_key2));
|
| @@ -84,7 +84,7 @@ TEST_P(SymmetricKeyDeriveKeyFromPasswordTest, DeriveKeyFromPassword) {
|
| crypto::SymmetricKey::DeriveKeyFromPassword(
|
| test_data.algorithm, test_data.password, test_data.salt,
|
| test_data.rounds, test_data.key_size_in_bits));
|
| - ASSERT_TRUE(NULL != key.get());
|
| + ASSERT_TRUE(key);
|
|
|
| std::string raw_key;
|
| key->GetRawKey(&raw_key);
|
|
|