pki: Add ASCII parsing mode for ASN.1 PrintableStrings Introduce an intermediate mode for parsing ASN.1 PrintableStrings, between PrintableStringHandling::kDefault (strict PrintableString enforcement) and kAsUTF8Hack (treats the string as UTF-8). The new mode, kAllowASCII, allows all ASCII characters (0x00-0x7f). Bug: 563054783 Change-Id: Ida54e43004987f67e42c80ecc09031c96a6a6964 Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/104769 Presubmit-BoringSSL-Verified: boringssl-scoped@luci-project-accounts.iam.gserviceaccount.com <boringssl-scoped@luci-project-accounts.iam.gserviceaccount.com> Reviewed-by: David Benjamin <davidben@google.com> Commit-Queue: Lily Chen <chlily@google.com>
diff --git a/pki/parse_name.cc b/pki/parse_name.cc index b5c264e..0fb378e 100644 --- a/pki/parse_name.cc +++ b/pki/parse_name.cc
@@ -62,10 +62,16 @@ bool X509NameAttribute::ValueAsStringWithUnsafeOptions( PrintableStringHandling printable_string_handling, std::string *out) const { - if (printable_string_handling == PrintableStringHandling::kAsUTF8Hack && - value_tag == CBS_ASN1_PRINTABLESTRING) { - *out = BytesAsStringView(value); - return true; + if (value_tag == CBS_ASN1_PRINTABLESTRING) { + switch (printable_string_handling) { + case PrintableStringHandling::kDefault: + break; + case PrintableStringHandling::kAllowASCII: + return der::ParseIA5String(value, out); + case PrintableStringHandling::kAsUTF8Hack: + *out = BytesAsStringView(value); + return true; + } } return ValueAsString(out); }
diff --git a/pki/parse_name.h b/pki/parse_name.h index 457c3c8..b90a91e 100644 --- a/pki/parse_name.h +++ b/pki/parse_name.h
@@ -80,9 +80,15 @@ : type(in_type), value_tag(in_value_tag), value(in_value) {} // Configures handling of PrintableString in the attribute value. Do - // not use non-default handling without consulting //net owners. With - // kAsUTF8Hack, PrintableStrings are interpreted as UTF-8 strings. - enum class PrintableStringHandling { kDefault, kAsUTF8Hack }; + // not use non-default handling without consulting //net owners. + enum class PrintableStringHandling { + // Strict enforcement of PrintableString rules. + kDefault, + // PrintableStrings containing ASCII characters (0x00-0x7F) are allowed. + kAllowASCII, + // PrintableStrings are interpreted as UTF-8 strings. + kAsUTF8Hack, + }; // Attempts to convert the value represented by this struct into a // UTF-8 string and store it in `out`, returning whether the conversion
diff --git a/pki/parse_name_unittest.cc b/pki/parse_name_unittest.cc index 1ed831f..7ff138d 100644 --- a/pki/parse_name_unittest.cc +++ b/pki/parse_name_unittest.cc
@@ -94,7 +94,7 @@ ASSERT_FALSE(value.ValueAsString(&result)); } -TEST(ParseNameTest, PrintableStringUnsafeOptions) { +TEST(ParseNameTest, PrintableStringUnsafeOptionsAllowASCII) { const uint8_t der[] = { 0x46, 0x6f, 0x5f, 0x20, 0x62, 0x61, 0x72, }; @@ -104,10 +104,28 @@ ASSERT_FALSE(value.ValueAsStringWithUnsafeOptions( X509NameAttribute::PrintableStringHandling::kDefault, &result)); ASSERT_TRUE(value.ValueAsStringWithUnsafeOptions( + X509NameAttribute::PrintableStringHandling::kAllowASCII, &result)); + ASSERT_TRUE(value.ValueAsStringWithUnsafeOptions( X509NameAttribute::PrintableStringHandling::kAsUTF8Hack, &result)); ASSERT_EQ("Fo_ bar", result); } +TEST(ParseNameTest, PrintableStringUnsafeOptionsAsUTF8Hack) { + const uint8_t der[] = { + 0x63, 0x61, 0x66, 0xc3, 0xa9, + }; + X509NameAttribute value(der::Input(), CBS_ASN1_PRINTABLESTRING, + der::Input(der)); + std::string result; + ASSERT_FALSE(value.ValueAsStringWithUnsafeOptions( + X509NameAttribute::PrintableStringHandling::kDefault, &result)); + ASSERT_FALSE(value.ValueAsStringWithUnsafeOptions( + X509NameAttribute::PrintableStringHandling::kAllowASCII, &result)); + ASSERT_TRUE(value.ValueAsStringWithUnsafeOptions( + X509NameAttribute::PrintableStringHandling::kAsUTF8Hack, &result)); + ASSERT_EQ("café", result); +} + TEST(ParseNameTest, TeletexSafeStringValue) { const uint8_t der[] = { 0x46, 0x6f, 0x6f, 0x20, 0x62, 0x61, 0x72,