diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2012-11-12 22:00:53 +0000 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2012-11-12 22:00:53 +0000 |
| commit | f267dda0d5e95475049ee9aba554e5007570ad23 (patch) | |
| tree | c4d576bf4fae638d34e721161822ed20f775f150 /asn1/x509sat | |
| parent | 4e96e6c4753bf4cf286bcce82c2fa8f097dbef09 (diff) | |
Added attributes from RFC 2798.
svn path=/trunk/; revision=46013
Diffstat (limited to 'asn1/x509sat')
| -rw-r--r-- | asn1/x509sat/packet-x509sat-template.c | 2 | ||||
| -rw-r--r-- | asn1/x509sat/x509sat.cnf | 12 |
2 files changed, 13 insertions, 1 deletions
diff --git a/asn1/x509sat/packet-x509sat-template.c b/asn1/x509sat/packet-x509sat-template.c index 1f91786e87..9b7b740bb2 100644 --- a/asn1/x509sat/packet-x509sat-template.c +++ b/asn1/x509sat/packet-x509sat-template.c @@ -112,6 +112,8 @@ void proto_reg_handoff_x509sat(void) { oid_add_from_string("dcObject","1.3.6.1.4.1.1446.344"); oid_add_from_string("domain","0.9.2342.19200300.100.4.13"); + /* RFC 2798 */ + oid_add_from_string("inetOrgPerson","2.16.840.1.113730.3.2.2"); } diff --git a/asn1/x509sat/x509sat.cnf b/asn1/x509sat/x509sat.cnf index c90d54ead8..f8a6c05c38 100644 --- a/asn1/x509sat/x509sat.cnf +++ b/asn1/x509sat/x509sat.cnf @@ -307,7 +307,6 @@ DirectoryString B "1.2.840.113549.1.9.13" "pkcs-9-at-signingDescription" #SMIMECapabiliaties B "1.2.840.113549.1.9.15" "pkcs-9-at-smimeCapabilities" - TBD SyntaxBMPString B "1.2.840.113549.1.9.20" "pkcs-9-at-friendlyName" OctetString B "1.2.840.113549.1.9.21" "pkcs-9-at-localKeyId" -#PFX B "2.16.840.1.113730.3.1.216" "pkcs-9-at-PKCS12" - see pkcs12.cnf #PKCS15Token B "1.2.840.113549.1.9.25.1" "pkcs-9-at-pkcs15Token" - TBD #EncryptedPrivateKeyInfo B "1.2.840.113549.1.9.25.2" "pkcs-9-at-encryptedPrivateKeyInfo" - see pkcs12.cnf OctetString B "1.2.840.113549.1.9.25.3" "pkcs-9-at-randomNonce" # move to PKCS#9 when defined @@ -323,6 +322,17 @@ SyntaxPrintableString B "1.3.6.1.5.5.7.9.5" "pkcs-9-at-countryOfResidence" # RFC 2247 SyntaxIA5String B "0.9.2342.19200300.100.1.25" "dc" +# RFC 2798 - The LDAP inetOrgPerson Object Class +DirectoryString B "2.16.840.1.113730.3.1.1" "carLicense" +DirectoryString B "2.16.840.1.113730.3.1.2" "departmentNumber" +DirectoryString B "2.16.840.1.113730.3.1.3" "employeeNumber" +DirectoryString B "2.16.840.1.113730.3.1.4" "employeeType" +#JPEG B "0.9.2342.19200300.100.1.60" "jpegPhoto" - see packet-jpeg.c +DirectoryString B "2.16.840.1.113730.3.1.39" "preferredLanguage" +#SignedData B "2.16.840.1.113730.3.1.40" "userSMIMECertificate" - see cms.cnf +#PFX B "2.16.840.1.113730.3.1.216" "pkcs-9-at-PKCS12" - see pkcs12.cnf +DirectoryString B "2.16.840.1.113730.3.1.241" "displayName" + # Microsoft-specific # GeneralName other-name SyntaxBMPString B "1.3.6.1.4.1.311.20.2" "id-ms-certificate-template-name" |