diff options
| author | Peter Andersson <[email protected]> | 2012-08-27 12:00:24 +0200 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2012-08-27 12:00:24 +0200 |
| commit | 0ff106bd0fa654c09144102ca5baf73bb1d3a459 (patch) | |
| tree | b8d4dfb7b689823a28353b5ad41f0302360ed281 /lib/public_key/asn1 | |
| parent | ae2c50f36806b26530de88d2609cd6ced018cb54 (diff) | |
| parent | fd7423d3fc1a32e497084d5c70e2d05792032925 (diff) | |
| download | otp-0ff106bd0fa654c09144102ca5baf73bb1d3a459.tar.gz otp-0ff106bd0fa654c09144102ca5baf73bb1d3a459.tar.bz2 otp-0ff106bd0fa654c09144102ca5baf73bb1d3a459.zip | |
Merge remote branch 'upstream/maint' into maint
Diffstat (limited to 'lib/public_key/asn1')
| -rw-r--r-- | lib/public_key/asn1/OTP-PKIX.asn1 | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/lib/public_key/asn1/OTP-PKIX.asn1 b/lib/public_key/asn1/OTP-PKIX.asn1 index fbf531df40..e94a77a3e7 100644 --- a/lib/public_key/asn1/OTP-PKIX.asn1 +++ b/lib/public_key/asn1/OTP-PKIX.asn1 @@ -225,7 +225,17 @@ dnQualifier ATTRIBUTE-TYPE-AND-VALUE-CLASS ::= { countryName ATTRIBUTE-TYPE-AND-VALUE-CLASS ::= { ID id-at-countryName - TYPE X520countryName } + TYPE X520countryName } -- this is currently not used when decoding + -- The decoding and mapping between ID and Type is done in the code + -- in module publickey_cert_records via the function attribute_type + -- To be more forgiving and compatible with other SSL implementations + -- regarding how to handle and sometimes accept incorrect certificates + -- we define and use the type below instead of X520countryName + + OTP-X520countryname ::= CHOICE { + printableString PrintableString (SIZE (2)), + utf8String UTF8String (SIZE (2)) +} serialNumber ATTRIBUTE-TYPE-AND-VALUE-CLASS ::= { ID id-at-serialNumber |