aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngela Andin <[email protected]>2019-03-20 15:33:19 +0100
committerGitHub <[email protected]>2019-03-20 15:33:19 +0100
commit460a958e60f8c2266bb78be1aab2a9c0f64cbb28 (patch)
treed689c23ee90fd901b15552779b9feababd4d6e6c
parentba118afbcd433b545ad0d528dec3b9cda19937c4 (diff)
parent48d6243d8a45d711ce4a861a45e5992294fdbb80 (diff)
downloadotp-460a958e60f8c2266bb78be1aab2a9c0f64cbb28.tar.gz
otp-460a958e60f8c2266bb78be1aab2a9c0f64cbb28.tar.bz2
otp-460a958e60f8c2266bb78be1aab2a9c0f64cbb28.zip
Merge pull request #2162 from danbaranov/public-key-less-strict-county-name-check
public_key: Work around for certificates with 3 character country codes OTP-15687
-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 ::= {