Skip to content

tls: Fix OCSP version tag handling #20079

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ggreenway merged 1 commit into from
Feb 28, 2022
Merged

tls: Fix OCSP version tag handling #20079

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion source/extensions/transport_sockets/tls/ocsp/ocsp.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ ResponseData Asn1OcspUtility::parseResponseData(CBS& cbs) {
throw EnvoyException("OCSP ResponseData is not a well-formed ASN.1 SEQUENCE");
}

unwrap(Asn1Utility::skipOptional(elem, 0));
unwrap(Asn1Utility::skipOptional(elem, CBS_ASN1_CONTEXT_SPECIFIC | CBS_ASN1_CONSTRUCTED | 0));
skipResponderId(elem);
unwrap(Asn1Utility::skip(elem, CBS_ASN1_GENERALIZEDTIME));
auto responses = unwrap(Asn1Utility::parseSequenceOf<SingleResponse>(
Expand Down
12 changes: 7 additions & 5 deletions test/extensions/transport_sockets/tls/ocsp/asn1_utility_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ TEST_F(Asn1UtilityTest, GetOptionalMissingValueTest) {

TEST_F(Asn1UtilityTest, ParseOptionalTest) {
std::vector<uint8_t> nothing;
std::vector<uint8_t> explicit_optional_true = {0, 3, 0x1u, 1, 0xff};
std::vector<uint8_t> explicit_optional_true = {0xa0, 3, 0x1u, 1, 0xff};
std::vector<uint8_t> missing_val_bool = {0x1u, 1};

auto parse_bool = [](CBS& cbs) -> bool {
Expand All @@ -191,8 +191,9 @@ TEST_F(Asn1UtilityTest, ParseOptionalTest) {
explicit_optional_true.size());

absl::optional<bool> expected(true);
EXPECT_EQ(expected, absl::get<0>(Asn1Utility::parseOptional<bool>(cbs_explicit_optional_true,
parse_bool, 0)));
EXPECT_EQ(expected, absl::get<0>(Asn1Utility::parseOptional<bool>(
cbs_explicit_optional_true, parse_bool,
CBS_ASN1_CONTEXT_SPECIFIC | CBS_ASN1_CONSTRUCTED | 0)));
}

{
Expand Down Expand Up @@ -224,8 +225,9 @@ TEST_F(Asn1UtilityTest, ParseOptionalTest) {
CBS_init(&cbs_explicit_optional_true, explicit_optional_true.data(),
explicit_optional_true.size());

EXPECT_EQ("failed", absl::get<1>(Asn1Utility::parseOptional<bool>(cbs_explicit_optional_true,
parse_bool_fail, 0)));
EXPECT_EQ("failed", absl::get<1>(Asn1Utility::parseOptional<bool>(
cbs_explicit_optional_true, parse_bool_fail,
CBS_ASN1_CONTEXT_SPECIFIC | CBS_ASN1_CONSTRUCTED | 0)));
}
}

Expand Down
5 changes: 3 additions & 2 deletions test/extensions/transport_sockets/tls/ocsp/ocsp_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,9 +193,10 @@ TEST_F(Asn1OcspUtilityTest, ParseResponseDataBadResponderIdVariantTest) {
std::vector<uint8_t> data = {
// SEQUENCE
0x30,
6,
7,
// version
0,
0xa0,
0x02,
1,
0,
// Invalid Responder ID tag 3
Expand Down