diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2004-01-03 15:39:16 +0000 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2004-01-03 15:39:16 +0000 |
| commit | 43738c7b7098fa974a59f2c939f2b2632c52c265 (patch) | |
| tree | 5f2c39885f6c50a72625a0592e461441554e9e57 /lib | |
| parent | 9de6741877f3156f7ad66d709fa8a84ceb3c50fd (diff) | |
| download | gnutls-43738c7b7098fa974a59f2c939f2b2632c52c265.tar.gz | |
Corrected problem printing the DC attributes in a DN.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pkix.asn | 11 | ||||
| -rw-r--r-- | lib/pkix_asn1_tab.c | 20 | ||||
| -rw-r--r-- | lib/x509/common.c | 2 | ||||
| -rw-r--r-- | lib/x509/dn.c | 1 |
4 files changed, 32 insertions, 2 deletions
diff --git a/lib/pkix.asn b/lib/pkix.asn index c43743b90b..2ec091e0fc 100644 --- a/lib/pkix.asn +++ b/lib/pkix.asn @@ -1206,4 +1206,15 @@ pkcs-7-EncryptedContent ::= OCTET STRING pkcs-7-UnprotectedAttributes ::= SET SIZE (1..MAX) OF Attribute +-- LDAP stuff +-- may not be correct + +id-at-ldap-DC AttributeType ::= { 0 9 2342 19200300 100 1 25 } + +ldap-DC ::= IA5String + +id-at-ldap-UID AttributeType ::= { 0 9 2342 19200300 100 1 1 } + +ldap-UID ::= IA5String + END diff --git a/lib/pkix_asn1_tab.c b/lib/pkix_asn1_tab.c index d47aa460ae..159c0c64be 100644 --- a/lib/pkix_asn1_tab.c +++ b/lib/pkix_asn1_tab.c @@ -1071,8 +1071,26 @@ const ASN1_ARRAY_TYPE pkix_asn1_tab[]={ {0,4104,"0"}, {"pkcs-7-ContentEncryptionAlgorithmIdentifier",1073741826,"AlgorithmIdentifier"}, {"pkcs-7-EncryptedContent",1073741831,0}, - {"pkcs-7-UnprotectedAttributes",538968079,0}, + {"pkcs-7-UnprotectedAttributes",1612709903,0}, {"MAX",1074266122,"1"}, {0,2,"Attribute"}, + {"id-at-ldap-DC",1880096780,"AttributeType"}, + {0,1073741825,"0"}, + {0,1073741825,"9"}, + {0,1073741825,"2342"}, + {0,1073741825,"19200300"}, + {0,1073741825,"100"}, + {0,1073741825,"1"}, + {0,1,"25"}, + {"ldap-DC",1073741826,"IA5String"}, + {"id-at-ldap-UID",1880096780,"AttributeType"}, + {0,1073741825,"0"}, + {0,1073741825,"9"}, + {0,1073741825,"2342"}, + {0,1073741825,"19200300"}, + {0,1073741825,"100"}, + {0,1073741825,"1"}, + {0,1,"1"}, + {"ldap-UID",2,"IA5String"}, {0,0,0} }; diff --git a/lib/x509/common.c b/lib/x509/common.c index ebbdd11a24..adc7965b96 100644 --- a/lib/x509/common.c +++ b/lib/x509/common.c @@ -55,7 +55,7 @@ static const oid2string _oid2str[] = { {"2.5.4.20", "telephoneNumber", 0, 1}, {"0.9.2342.19200300.100.1.25", "DC", 0, 1}, - {"0.9.2342.19200300.100.1.1", "UID", 0, 1}, /* FIXME: CHOICE? */ + {"0.9.2342.19200300.100.1.1", "UID", 0, 1}, {"1.2.840.113549.1.9.1", "EMAIL", 0, 1}, {"1.2.840.113549.1.9.7", NULL, 1, 1}, diff --git a/lib/x509/dn.c b/lib/x509/dn.c index ae3af42c0e..3f0f34cba5 100644 --- a/lib/x509/dn.c +++ b/lib/x509/dn.c @@ -273,6 +273,7 @@ int _gnutls_x509_parse_dn(ASN1_TYPE asn1_struct, len, string, &sizeof_string); + if (result < 0) { gnutls_assert(); _gnutls_x509_log |