diff options
| author | chrome-bot <chrome-bot@chromium.org> | 2019-01-13 13:52:20 -0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2019-01-13 13:52:20 -0800 |
| commit | bacee4044e68cb5d7044e54fe8cfa87baf2960ba (patch) | |
| tree | add5e4a6b9effaf558701198868fbe95c33961f1 /payload_generator/payload_signer_unittest.cc | |
| parent | ef13c92c549fee1a73118c32315e4472a5c4ffa3 (diff) | |
| parent | 7438410328547d8f55b6555ebdcfd9768978fcb9 (diff) | |
Merge commit '7438410328547d8f55b6555ebdcfd9768978fcb9' into patch_branch
Change-Id: Idc4f0d63865479d4e3b85069270c6c21d52a747d
Diffstat (limited to 'payload_generator/payload_signer_unittest.cc')
| -rw-r--r-- | payload_generator/payload_signer_unittest.cc | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/payload_generator/payload_signer_unittest.cc b/payload_generator/payload_signer_unittest.cc index 967e0267..a6ef38d3 100644 --- a/payload_generator/payload_signer_unittest.cc +++ b/payload_generator/payload_signer_unittest.cc @@ -153,14 +153,15 @@ TEST_F(PayloadSignerTest, VerifyAllSignatureTest) { GetBuildArtifactsPath(kUnittestPrivateKey2Path)}); // Either public key should pass the verification. + string public_key; + EXPECT_TRUE(utils::ReadFile(GetBuildArtifactsPath(kUnittestPublicKeyPath), + &public_key)); EXPECT_TRUE(PayloadVerifier::VerifySignature( - signature_blob, - GetBuildArtifactsPath(kUnittestPublicKeyPath), - padded_hash_data_)); + signature_blob, public_key, padded_hash_data_)); + EXPECT_TRUE(utils::ReadFile(GetBuildArtifactsPath(kUnittestPublicKey2Path), + &public_key)); EXPECT_TRUE(PayloadVerifier::VerifySignature( - signature_blob, - GetBuildArtifactsPath(kUnittestPublicKey2Path), - padded_hash_data_)); + signature_blob, public_key, padded_hash_data_)); } TEST_F(PayloadSignerTest, VerifySignatureTest) { @@ -168,15 +169,16 @@ TEST_F(PayloadSignerTest, VerifySignatureTest) { SignSampleData(&signature_blob, {GetBuildArtifactsPath(kUnittestPrivateKeyPath)}); + string public_key; + EXPECT_TRUE(utils::ReadFile(GetBuildArtifactsPath(kUnittestPublicKeyPath), + &public_key)); EXPECT_TRUE(PayloadVerifier::VerifySignature( - signature_blob, - GetBuildArtifactsPath(kUnittestPublicKeyPath), - padded_hash_data_)); + signature_blob, public_key, padded_hash_data_)); // Passing the invalid key should fail the verification. - EXPECT_FALSE(PayloadVerifier::VerifySignature( - signature_blob, - GetBuildArtifactsPath(kUnittestPublicKey2Path), - padded_hash_data_)); + EXPECT_TRUE(utils::ReadFile(GetBuildArtifactsPath(kUnittestPublicKey2Path), + &public_key)); + EXPECT_TRUE(PayloadVerifier::VerifySignature( + signature_blob, public_key, padded_hash_data_)); } TEST_F(PayloadSignerTest, SkipMetadataSignatureTest) { |