Sync pki to chromium 8049b24a3fa617e66c5d3fc0e9322bb07c500f49 Change-Id: Ib65febca30ce312f2c8fd6d6dbc85f24987b50d8 Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/62245 Auto-Submit: Bob Beck <bbe@google.com> Reviewed-by: David Benjamin <davidben@google.com> Commit-Queue: David Benjamin <davidben@google.com>
diff --git a/pki/certificate_policies_unittest.cc b/pki/certificate_policies_unittest.cc index af9332c..fcf10b8 100644 --- a/pki/certificate_policies_unittest.cc +++ b/pki/certificate_policies_unittest.cc
@@ -44,7 +44,7 @@ std::vector<der::Input> policies; CertErrors errors; EXPECT_FALSE(ParseCertificatePoliciesExtensionOids( - der::Input(&der), fail_parsing_unknown_qualifier_oids(), &policies, + der::Input(der), fail_parsing_unknown_qualifier_oids(), &policies, &errors)); } @@ -54,7 +54,7 @@ std::vector<der::Input> policies; CertErrors errors; EXPECT_FALSE(ParseCertificatePoliciesExtensionOids( - der::Input(&der), fail_parsing_unknown_qualifier_oids(), &policies, + der::Input(der), fail_parsing_unknown_qualifier_oids(), &policies, &errors)); } @@ -64,7 +64,7 @@ std::vector<der::Input> policies; CertErrors errors; EXPECT_TRUE(ParseCertificatePoliciesExtensionOids( - der::Input(&der), fail_parsing_unknown_qualifier_oids(), &policies, + der::Input(der), fail_parsing_unknown_qualifier_oids(), &policies, &errors)); ASSERT_EQ(1U, policies.size()); EXPECT_EQ(der::Input(kAnyPolicyOid), policies[0]); @@ -76,7 +76,7 @@ std::vector<der::Input> policies; CertErrors errors; EXPECT_TRUE(ParseCertificatePoliciesExtensionOids( - der::Input(&der), fail_parsing_unknown_qualifier_oids(), &policies, + der::Input(der), fail_parsing_unknown_qualifier_oids(), &policies, &errors)); ASSERT_EQ(1U, policies.size()); EXPECT_EQ(der::Input(kAnyPolicyOid), policies[0]); @@ -90,7 +90,7 @@ std::vector<der::Input> policies; CertErrors errors; EXPECT_FALSE(ParseCertificatePoliciesExtensionOids( - der::Input(&der), fail_parsing_unknown_qualifier_oids(), &policies, + der::Input(der), fail_parsing_unknown_qualifier_oids(), &policies, &errors)); } @@ -100,7 +100,7 @@ std::vector<der::Input> policies; CertErrors errors; EXPECT_TRUE(ParseCertificatePoliciesExtensionOids( - der::Input(&der), fail_parsing_unknown_qualifier_oids(), &policies, + der::Input(der), fail_parsing_unknown_qualifier_oids(), &policies, &errors)); ASSERT_EQ(1U, policies.size()); EXPECT_EQ(der::Input(policy_1_2_3_der), policies[0]); @@ -112,7 +112,7 @@ std::vector<der::Input> policies; CertErrors errors; EXPECT_TRUE(ParseCertificatePoliciesExtensionOids( - der::Input(&der), fail_parsing_unknown_qualifier_oids(), &policies, + der::Input(der), fail_parsing_unknown_qualifier_oids(), &policies, &errors)); ASSERT_EQ(1U, policies.size()); EXPECT_EQ(der::Input(policy_1_2_3_der), policies[0]); @@ -125,7 +125,7 @@ std::vector<der::Input> policies; CertErrors errors; bool result = ParseCertificatePoliciesExtensionOids( - der::Input(&der), fail_parsing_unknown_qualifier_oids(), &policies, + der::Input(der), fail_parsing_unknown_qualifier_oids(), &policies, &errors); if (fail_parsing_unknown_qualifier_oids()) { @@ -144,7 +144,7 @@ std::vector<der::Input> policies; CertErrors errors; EXPECT_FALSE(ParseCertificatePoliciesExtensionOids( - der::Input(&der), fail_parsing_unknown_qualifier_oids(), &policies, + der::Input(der), fail_parsing_unknown_qualifier_oids(), &policies, &errors)); } @@ -156,7 +156,7 @@ std::vector<der::Input> policies; CertErrors errors; EXPECT_FALSE(ParseCertificatePoliciesExtensionOids( - der::Input(&der), fail_parsing_unknown_qualifier_oids(), &policies, + der::Input(der), fail_parsing_unknown_qualifier_oids(), &policies, &errors)); } @@ -168,7 +168,7 @@ std::vector<der::Input> policies; CertErrors errors; EXPECT_FALSE(ParseCertificatePoliciesExtensionOids( - der::Input(&der), fail_parsing_unknown_qualifier_oids(), &policies, + der::Input(der), fail_parsing_unknown_qualifier_oids(), &policies, &errors)); } @@ -180,7 +180,7 @@ std::vector<der::Input> policies; CertErrors errors; EXPECT_FALSE(ParseCertificatePoliciesExtensionOids( - der::Input(&der), fail_parsing_unknown_qualifier_oids(), &policies, + der::Input(der), fail_parsing_unknown_qualifier_oids(), &policies, &errors)); } @@ -190,7 +190,7 @@ std::vector<der::Input> policies; CertErrors errors; EXPECT_TRUE(ParseCertificatePoliciesExtensionOids( - der::Input(&der), fail_parsing_unknown_qualifier_oids(), &policies, + der::Input(der), fail_parsing_unknown_qualifier_oids(), &policies, &errors)); ASSERT_EQ(2U, policies.size()); EXPECT_EQ(der::Input(policy_1_2_3_der), policies[0]); @@ -203,7 +203,7 @@ std::vector<der::Input> policies; CertErrors errors; EXPECT_TRUE(ParseCertificatePoliciesExtensionOids( - der::Input(&der), fail_parsing_unknown_qualifier_oids(), &policies, + der::Input(der), fail_parsing_unknown_qualifier_oids(), &policies, &errors)); ASSERT_EQ(2U, policies.size()); EXPECT_EQ(der::Input(policy_1_2_3_der), policies[0]); @@ -216,7 +216,7 @@ std::vector<PolicyInformation> policies; CertErrors errors; EXPECT_FALSE( - ParseCertificatePoliciesExtension(der::Input(&der), &policies, &errors)); + ParseCertificatePoliciesExtension(der::Input(der), &policies, &errors)); } TEST(ParseCertificatePoliciesExtensionTest, @@ -226,7 +226,7 @@ std::vector<PolicyInformation> policies; CertErrors errors; EXPECT_FALSE( - ParseCertificatePoliciesExtension(der::Input(&der), &policies, &errors)); + ParseCertificatePoliciesExtension(der::Input(der), &policies, &errors)); } TEST(ParseCertificatePoliciesExtensionTest, OnePolicyWithCustomQualifier) { @@ -235,7 +235,7 @@ std::vector<PolicyInformation> policies; CertErrors errors; EXPECT_TRUE( - ParseCertificatePoliciesExtension(der::Input(&der), &policies, &errors)); + ParseCertificatePoliciesExtension(der::Input(der), &policies, &errors)); ASSERT_EQ(1U, policies.size()); PolicyInformation& policy = policies[0]; EXPECT_EQ(der::Input(policy_1_2_3_der), policy.policy_oid); @@ -256,7 +256,7 @@ std::vector<PolicyInformation> policies; CertErrors errors; EXPECT_TRUE( - ParseCertificatePoliciesExtension(der::Input(&der), &policies, &errors)); + ParseCertificatePoliciesExtension(der::Input(der), &policies, &errors)); ASSERT_EQ(2U, policies.size()); { PolicyInformation& policy = policies[0]; @@ -276,7 +276,7 @@ std::vector<PolicyInformation> policies; CertErrors errors; EXPECT_TRUE( - ParseCertificatePoliciesExtension(der::Input(&der), &policies, &errors)); + ParseCertificatePoliciesExtension(der::Input(der), &policies, &errors)); ASSERT_EQ(2U, policies.size()); { PolicyInformation& policy = policies[0];