diff options
author | Ingela Anderton Andin <[email protected]> | 2012-11-16 10:26:54 +0100 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2012-11-16 10:26:54 +0100 |
commit | 94e3d2d216b843a2f3e7187e3f972ebbe3134eba (patch) | |
tree | fe7d2e7b42fcb08d286260228f9c0af221fbf311 /lib/public_key/asn1/PKIX1Explicit88.asn1 | |
parent | 180ceb2f7b138f34443d76fe1c99514e4adc6a84 (diff) | |
parent | 9aa4de3c97b98974f32c2b8e07c971343faf3f13 (diff) | |
download | otp-94e3d2d216b843a2f3e7187e3f972ebbe3134eba.tar.gz otp-94e3d2d216b843a2f3e7187e3f972ebbe3134eba.tar.bz2 otp-94e3d2d216b843a2f3e7187e3f972ebbe3134eba.zip |
Merge remote branch 'upstream/maint'
Diffstat (limited to 'lib/public_key/asn1/PKIX1Explicit88.asn1')
-rw-r--r-- | lib/public_key/asn1/PKIX1Explicit88.asn1 | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/public_key/asn1/PKIX1Explicit88.asn1 b/lib/public_key/asn1/PKIX1Explicit88.asn1 index 03e9da3e05..91758d7269 100644 --- a/lib/public_key/asn1/PKIX1Explicit88.asn1 +++ b/lib/public_key/asn1/PKIX1Explicit88.asn1 @@ -206,13 +206,12 @@ DomainComponent ::= IA5String -- Legacy attributes -pkcs-9 OBJECT IDENTIFIER ::= - { iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) 9 } - id-emailAddress AttributeType ::= { pkcs-9 1 } EmailAddress ::= IA5String (SIZE (1..ub-emailaddress-length)) +-- Legacy attributes + -- naming data types -- Name ::= CHOICE { -- only one possibility for now -- |