aboutsummaryrefslogtreecommitdiff
path: root/src/pki/parse_name_unittest.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/pki/parse_name_unittest.cc')
-rw-r--r--src/pki/parse_name_unittest.cc45
1 files changed, 25 insertions, 20 deletions
diff --git a/src/pki/parse_name_unittest.cc b/src/pki/parse_name_unittest.cc
index fec2e07..ceef9c2 100644
--- a/src/pki/parse_name_unittest.cc
+++ b/src/pki/parse_name_unittest.cc
@@ -4,8 +4,8 @@
#include "parse_name.h"
-#include "test_helpers.h"
#include <gtest/gtest.h>
+#include "test_helpers.h"
namespace bssl {
@@ -16,10 +16,10 @@ namespace {
// |value_type| indicates what ASN.1 type is used to encode the data.
// |suffix| indicates any additional modifications, such as caseswapping,
// whitespace adding, etc.
-::testing::AssertionResult LoadTestData(const std::string& prefix,
- const std::string& value_type,
- const std::string& suffix,
- std::string* result) {
+::testing::AssertionResult LoadTestData(const std::string &prefix,
+ const std::string &value_type,
+ const std::string &suffix,
+ std::string *result) {
std::string path = "testdata/verify_name_match_unittest/names/" + prefix +
"-" + value_type + "-" + suffix + ".pem";
@@ -36,7 +36,7 @@ TEST(ParseNameTest, IA5SafeStringValue) {
const uint8_t der[] = {
0x46, 0x6f, 0x6f, 0x20, 0x62, 0x61, 0x72,
};
- X509NameAttribute value(der::Input(), der::kIA5String, der::Input(der));
+ X509NameAttribute value(der::Input(), CBS_ASN1_IA5STRING, der::Input(der));
std::string result_unsafe;
ASSERT_TRUE(value.ValueAsStringUnsafe(&result_unsafe));
ASSERT_EQ("Foo bar", result_unsafe);
@@ -49,7 +49,7 @@ TEST(ParseNameTest, IA5UnsafeStringValue) {
const uint8_t der[] = {
0x46, 0x6f, 0xFF, 0x20, 0x62, 0x61, 0x72,
};
- X509NameAttribute value(der::Input(), der::kIA5String, der::Input(der));
+ X509NameAttribute value(der::Input(), CBS_ASN1_IA5STRING, der::Input(der));
std::string result_unsafe;
ASSERT_TRUE(value.ValueAsStringUnsafe(&result_unsafe));
ASSERT_EQ("Fo\377 bar", result_unsafe);
@@ -61,7 +61,8 @@ TEST(ParseNameTest, PrintableSafeStringValue) {
const uint8_t der[] = {
0x46, 0x6f, 0x6f, 0x20, 0x62, 0x61, 0x72,
};
- X509NameAttribute value(der::Input(), der::kPrintableString, der::Input(der));
+ X509NameAttribute value(der::Input(), CBS_ASN1_PRINTABLESTRING,
+ der::Input(der));
std::string result_unsafe;
ASSERT_TRUE(value.ValueAsStringUnsafe(&result_unsafe));
ASSERT_EQ("Foo bar", result_unsafe);
@@ -74,7 +75,8 @@ TEST(ParseNameTest, PrintableUnsafeStringValue) {
const uint8_t der[] = {
0x46, 0x6f, 0x5f, 0x20, 0x62, 0x61, 0x72,
};
- X509NameAttribute value(der::Input(), der::kPrintableString, der::Input(der));
+ X509NameAttribute value(der::Input(), CBS_ASN1_PRINTABLESTRING,
+ der::Input(der));
std::string result_unsafe;
ASSERT_TRUE(value.ValueAsStringUnsafe(&result_unsafe));
ASSERT_EQ("Fo_ bar", result_unsafe);
@@ -86,7 +88,8 @@ TEST(ParseNameTest, PrintableStringUnsafeOptions) {
const uint8_t der[] = {
0x46, 0x6f, 0x5f, 0x20, 0x62, 0x61, 0x72,
};
- X509NameAttribute value(der::Input(), der::kPrintableString, der::Input(der));
+ X509NameAttribute value(der::Input(), CBS_ASN1_PRINTABLESTRING,
+ der::Input(der));
std::string result;
ASSERT_FALSE(value.ValueAsStringWithUnsafeOptions(
X509NameAttribute::PrintableStringHandling::kDefault, &result));
@@ -99,7 +102,7 @@ TEST(ParseNameTest, TeletexSafeStringValue) {
const uint8_t der[] = {
0x46, 0x6f, 0x6f, 0x20, 0x62, 0x61, 0x72,
};
- X509NameAttribute value(der::Input(), der::kTeletexString, der::Input(der));
+ X509NameAttribute value(der::Input(), CBS_ASN1_T61STRING, der::Input(der));
std::string result_unsafe;
ASSERT_TRUE(value.ValueAsStringUnsafe(&result_unsafe));
ASSERT_EQ("Foo bar", result_unsafe);
@@ -112,7 +115,7 @@ TEST(ParseNameTest, TeletexLatin1StringValue) {
const uint8_t der[] = {
0x46, 0x6f, 0xd6, 0x20, 0x62, 0x61, 0x72,
};
- X509NameAttribute value(der::Input(), der::kTeletexString, der::Input(der));
+ X509NameAttribute value(der::Input(), CBS_ASN1_T61STRING, der::Input(der));
std::string result_unsafe;
ASSERT_TRUE(value.ValueAsStringUnsafe(&result_unsafe));
ASSERT_EQ("Fo\xd6 bar", result_unsafe);
@@ -125,7 +128,7 @@ TEST(ParseNameTest, ConvertBmpString) {
const uint8_t der[] = {
0x00, 0x66, 0x00, 0x6f, 0x00, 0x6f, 0x00, 0x62, 0x00, 0x61, 0x00, 0x72,
};
- X509NameAttribute value(der::Input(), der::kBmpString, der::Input(der));
+ X509NameAttribute value(der::Input(), CBS_ASN1_BMPSTRING, der::Input(der));
std::string result_unsafe;
ASSERT_TRUE(value.ValueAsStringUnsafe(&result_unsafe));
ASSERT_EQ("foobar", result_unsafe);
@@ -137,7 +140,7 @@ TEST(ParseNameTest, ConvertBmpString) {
// BmpString must encode characters in pairs of 2 bytes.
TEST(ParseNameTest, ConvertInvalidBmpString) {
const uint8_t der[] = {0x66, 0x6f, 0x6f, 0x62, 0x61, 0x72, 0x72};
- X509NameAttribute value(der::Input(), der::kBmpString, der::Input(der));
+ X509NameAttribute value(der::Input(), CBS_ASN1_BMPSTRING, der::Input(der));
std::string result;
ASSERT_FALSE(value.ValueAsStringUnsafe(&result));
ASSERT_FALSE(value.ValueAsString(&result));
@@ -147,7 +150,8 @@ TEST(ParseNameTest, ConvertUniversalString) {
const uint8_t der[] = {0x00, 0x00, 0x00, 0x66, 0x00, 0x00, 0x00, 0x6f,
0x00, 0x00, 0x00, 0x6f, 0x00, 0x00, 0x00, 0x62,
0x00, 0x00, 0x00, 0x61, 0x00, 0x00, 0x00, 0x72};
- X509NameAttribute value(der::Input(), der::kUniversalString, der::Input(der));
+ X509NameAttribute value(der::Input(), CBS_ASN1_UNIVERSALSTRING,
+ der::Input(der));
std::string result_unsafe;
ASSERT_TRUE(value.ValueAsStringUnsafe(&result_unsafe));
ASSERT_EQ("foobar", result_unsafe);
@@ -159,7 +163,8 @@ TEST(ParseNameTest, ConvertUniversalString) {
// UniversalString must encode characters in pairs of 4 bytes.
TEST(ParseNameTest, ConvertInvalidUniversalString) {
const uint8_t der[] = {0x66, 0x6f, 0x6f, 0x62, 0x61, 0x72};
- X509NameAttribute value(der::Input(), der::kUniversalString, der::Input(der));
+ X509NameAttribute value(der::Input(), CBS_ASN1_UNIVERSALSTRING,
+ der::Input(der));
std::string result;
ASSERT_FALSE(value.ValueAsStringUnsafe(&result));
ASSERT_FALSE(value.ValueAsString(&result));
@@ -187,13 +192,13 @@ TEST(ParseNameTest, ValidName) {
ASSERT_EQ(3u, atv.size());
ASSERT_EQ(1u, atv[0].size());
ASSERT_EQ(der::Input(kTypeCountryNameOid), atv[0][0].type);
- ASSERT_EQ("US", atv[0][0].value.AsString());
+ ASSERT_EQ("US", BytesAsStringView(atv[0][0].value));
ASSERT_EQ(1u, atv[1].size());
ASSERT_EQ(der::Input(kTypeOrganizationNameOid), atv[1][0].type);
- ASSERT_EQ("Google Inc.", atv[1][0].value.AsString());
+ ASSERT_EQ("Google Inc.", BytesAsStringView(atv[1][0].value));
ASSERT_EQ(1u, atv[2].size());
ASSERT_EQ(der::Input(kTypeCommonNameOid), atv[2][0].type);
- ASSERT_EQ("Google Test CA", atv[2][0].value.AsString());
+ ASSERT_EQ("Google Test CA", BytesAsStringView(atv[2][0].value));
}
TEST(ParseNameTest, InvalidNameExtraData) {
@@ -358,4 +363,4 @@ TEST(ParseNameTest, RFC2253FormatUTF8) {
ASSERT_EQ("SN=Lu\\C4\\8Di\\C4\\87", output);
}
-} // namespace net
+} // namespace bssl
generated by cgit v1.1 at 2024-08-04 08:43:26 +0000