aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2019-03-21 09:46:20 +0100
committerIngela Anderton Andin <[email protected]>2019-03-21 09:46:20 +0100
commit96bc98aefa9b5b52aebeceb52d4d92ed9d7046db (patch)
tree9bc9624784d6adf45c23f3628dcc6dc308bed093 /lib
parent22868eccf702d49c5813f0ab060fc86d67342b85 (diff)
parent460a958e60f8c2266bb78be1aab2a9c0f64cbb28 (diff)
downloadotp-96bc98aefa9b5b52aebeceb52d4d92ed9d7046db.tar.gz
otp-96bc98aefa9b5b52aebeceb52d4d92ed9d7046db.tar.bz2
otp-96bc98aefa9b5b52aebeceb52d4d92ed9d7046db.zip
Merge branch 'maint'
Diffstat (limited to 'lib')
-rw-r--r--lib/public_key/asn1/OTP-PKIX.asn18
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/public_key/asn1/OTP-PKIX.asn1 b/lib/public_key/asn1/OTP-PKIX.asn1
index 9bcd99fba3..ff3250b383 100644
--- a/lib/public_key/asn1/OTP-PKIX.asn1
+++ b/lib/public_key/asn1/OTP-PKIX.asn1
@@ -233,9 +233,13 @@ countryName ATTRIBUTE-TYPE-AND-VALUE-CLASS ::= {
-- regarding how to handle and sometimes accept incorrect certificates
-- we define and use the type below instead of X520countryName
+ -- We accept utf8String encoding of the US-ASCII
+ -- country name code and the mix up with other country code systems
+ -- that uses three characters instead of two.
+
OTP-X520countryname ::= CHOICE {
- printableString PrintableString (SIZE (2)),
- utf8String UTF8String (SIZE (2))
+ printableString PrintableString (SIZE (2..3)),
+ utf8String UTF8String (SIZE (2..3))
}
serialNumber ATTRIBUTE-TYPE-AND-VALUE-CLASS ::= {