Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8fdce9ab authored by Tao Bao's avatar Tao Bao
Browse files

resolve merge conflicts of 39ef2d7f to oc-dev-plus-aosp 

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I59d27cec1ef2c6befe824848cdc9ef3b0a0dc586
parents 6273c067 39ef2d7f

tests/component/verifier_test.cpp

+46 −3
Original line number Diff line number Diff line
@@ -132,6 +132,51 @@ TEST(VerifierTest, BadPackage_SignatureStartOutOfBounds) { 
                                        package.size(), certs));

}



TEST(VerifierTest, BadPackage_AlteredFooter) {

  std::string testkey_v3;

  ASSERT_TRUE(android::base::ReadFileToString(from_testdata_base("testkey_v3.txt"), &testkey_v3));

  TemporaryFile key_file1;

  ASSERT_TRUE(android::base::WriteStringToFile(testkey_v3, key_file1.path));

  std::vector<Certificate> certs;

  ASSERT_TRUE(load_keys(key_file1.path, certs));



  std::string package;

  ASSERT_TRUE(android::base::ReadFileToString(from_testdata_base("otasigned_v3.zip"), &package));

  ASSERT_EQ(std::string("\xc0\x06\xff\xff\xd2\x06", 6), package.substr(package.size() - 6, 6));



  // Alter the footer.

  package[package.size() - 5] = '\x05';

  ASSERT_EQ(VERIFY_FAILURE,

            verify_file(reinterpret_cast<const unsigned char*>(package.data()), package.size(),

                        certs));

}



TEST(VerifierTest, BadPackage_AlteredContent) {

  std::string testkey_v3;

  ASSERT_TRUE(android::base::ReadFileToString(from_testdata_base("testkey_v3.txt"), &testkey_v3));

  TemporaryFile key_file1;

  ASSERT_TRUE(android::base::WriteStringToFile(testkey_v3, key_file1.path));

  std::vector<Certificate> certs;

  ASSERT_TRUE(load_keys(key_file1.path, certs));



  std::string package;

  ASSERT_TRUE(android::base::ReadFileToString(from_testdata_base("otasigned_v3.zip"), &package));

  ASSERT_GT(package.size(), static_cast<size_t>(100));



  // Alter the content.

  std::string altered1(package);

  altered1[50] += 1;

  ASSERT_EQ(VERIFY_FAILURE,

            verify_file(reinterpret_cast<const unsigned char*>(altered1.data()), altered1.size(),

                        certs));



  std::string altered2(package);

  altered2[10] += 1;

  ASSERT_EQ(VERIFY_FAILURE,

            verify_file(reinterpret_cast<const unsigned char*>(altered2.data()), altered2.size(),

                        certs));

}



TEST_P(VerifierSuccessTest, VerifySucceed) {

  ASSERT_EQ(verify_file(memmap.addr, memmap.length, certs, nullptr), VERIFY_SUCCESS);

}
@@ -174,6 +219,4 @@ INSTANTIATE_TEST_CASE_P(WrongHash, VerifierFailureTest, 
INSTANTIATE_TEST_CASE_P(BadPackage, VerifierFailureTest,

    ::testing::Values(

      std::vector<std::string>({"random.zip", "v1"}),

      std::vector<std::string>({"fake-eocd.zip", "v1"}),

      std::vector<std::string>({"alter-metadata.zip", "v1"}),

      std::vector<std::string>({"alter-footer.zip", "v1"})));
 
      std::vector<std::string>({"fake-eocd.zip", "v1"})));

tests/testdata/alter-footer.zip

deleted100644 → 0
−3.92 KiB

File deleted.

View file

tests/testdata/alter-metadata.zip

deleted100644 → 0
−3.92 KiB

File deleted.

View file