diff options
| author | Fredrik Gustafsson <[email protected]> | 2013-11-15 10:54:17 +0100 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2013-11-15 10:54:17 +0100 |
| commit | d7c2b664bee2b869c923ff45f9a95e2f873c05ad (patch) | |
| tree | 780f0fa88412c0f4ed353ca428c192f263acc981 /lib/public_key/asn1/OTP-PKIX.asn1 | |
| parent | 19aedb5c0cb956e51b24fbba4923520efe7bf54b (diff) | |
| parent | 51608d139d079cbfb96aeb2d4313132b10d26d3e (diff) | |
| download | otp-d7c2b664bee2b869c923ff45f9a95e2f873c05ad.tar.gz otp-d7c2b664bee2b869c923ff45f9a95e2f873c05ad.tar.bz2 otp-d7c2b664bee2b869c923ff45f9a95e2f873c05ad.zip | |
Merge branch 'potatosalad/public_key_incorrect_emailaddress/OTP-11470' into maint
* potatosalad/public_key_incorrect_emailaddress/OTP-11470:
public_key_SUITE: Rename id-at-countryName to id-emailAddress
public_key: Workaround for incorrectly encoded utf8 emailAddress
Diffstat (limited to 'lib/public_key/asn1/OTP-PKIX.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 911a156d6c..8d3c76adf5 100644 --- a/lib/public_key/asn1/OTP-PKIX.asn1 +++ b/lib/public_key/asn1/OTP-PKIX.asn1 @@ -252,7 +252,17 @@ domainComponent ATTRIBUTE-TYPE-AND-VALUE-CLASS ::= { emailAddress ATTRIBUTE-TYPE-AND-VALUE-CLASS ::= { ID id-emailAddress - TYPE EmailAddress } + TYPE EmailAddress } -- 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 emailAddress + + OTP-emailAddress ::= CHOICE { + ia5String IA5String (SIZE (1..255)), + utf8String UTF8String (SIZE (1..255)) +} -- -- Signature and Public Key Algorithms |