synchronize with engine branch (some changes were done only

[oweals/openssl.git] / crypto / objects / objects.txt

diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt
index 3d443cf88479f4c182b5f484f3724351a0462e0d..fb73408f46577b7672723816b4a64bf72527b5a4 100644 (file)
--- a/crypto/objects/objects.txt
+++ b/crypto/objects/objects.txt
@@ -1,7 +1,13 @@
 1                      : ISO                   : iso
 
+2                      : JOINT-ISO-CCITT       : joint-iso-ccitt
+
 iso 2                  : member-body           : ISO Member Body
 
+joint-iso-ccitt 5 1 5  : selected-attribute-types      : Selected Attribute Types
+
+selected-attribute-types 55    : clearance
+
 member-body 840                : ISO-US                : ISO US Member Body
 ISO-US 10040           : X9-57                 : X9.57
 X9-57 4                        : X9cm                  : X9.57 CM ?
@@ -26,6 +32,7 @@ rsadsi 1              : pkcs                  : RSA Data Security, Inc. PKCS
 pkcs 1                 : pkcs1
 pkcs1 1                        :                       : rsaEncryption
 pkcs1 2                        : RSA-MD2               : md2WithRSAEncryption
+pkcs1 3                        : RSA-MD4               : md4WithRSAEncryption
 pkcs1 4                        : RSA-MD5               : md5WithRSAEncryption
 pkcs1 5                        : RSA-SHA1              : sha1WithRSAEncryption
 
@@ -302,6 +309,9 @@ id-pe 6                     : aaControls
 id-pe 7                        : sbqp-ipAddrBlock
 id-pe 8                        : sbqp-autonomousSysNum
 id-pe 9                        : sbqp-routerIdentifier
+id-pe 10               : ac-proxying
+!Cname sinfo-access
+id-pe 11               : subjectInfoAccess     : Subject Information Access
 
 # PKIX policyQualifiers for Internet policy qualifiers
 id-qt 1                        : id-qt-cps             : Policy Qualifier CPS
@@ -396,17 +406,18 @@ id-on 1                   : id-on-personalData
 # personal data attributes
 id-pda 1               : id-pda-dateOfBirth
 id-pda 2               : id-pda-placeOfBirth
-id-pda 3               : id-pda-pseudonym
-id-pda 4               : id-pda-gender
-id-pda 5               : id-pda-countryOfCitizenship
-id-pda 6               : id-pda-countryOfResidence
+id-pda 3               : id-pda-gender
+id-pda 4               : id-pda-countryOfCitizenship
+id-pda 5               : id-pda-countryOfResidence
 
 # attribute certificate attributes
 id-aca 1               : id-aca-authenticationInfo
 id-aca 2               : id-aca-accessIdentity
 id-aca 3               : id-aca-chargingIdentity
 id-aca 4               : id-aca-group
+# attention : the following seems to be obsolete, replace by 'role'
 id-aca 5               : id-aca-role
+id-aca 6               : id-aca-encAttrs
 
 # qualified certificate statements
 id-qcs 1               : id-qcs-pkixQCSyntax-v1
@@ -496,8 +507,9 @@ X509 13                     : D                     : description
 X509 41                        : name                  : name
 X509 42                        : G                     : givenName
 X509 43                        : I                     : initials
-X509 45                        : UID                   : uniqueIdentifier
+X509 45                        :                       : uniqueIdentifier
 X509 46                        : dnQualifier           : dnQualifier
+X509 72                        : role                  : role
 
 X500 8                 : X500algorithms        : directory services - algorithms
 X500algorithms 1 1     : RSA                   : rsa
@@ -531,8 +543,14 @@ id-ce 31           : crlDistributionPoints : X509v3 CRL Distribution Points
 id-ce 32               : certificatePolicies   : X509v3 Certificate Policies
 !Cname authority-key-identifier
 id-ce 35               : authorityKeyIdentifier : X509v3 Authority Key Identifier
+!Cname policy-constraints
+id-ce 36               : policyConstraints     : X509v3 Policy Constraints
 !Cname ext-key-usage
 id-ce 37               : extendedKeyUsage      : X509v3 Extended Key Usage
+!Cname target-information
+id-ce 55               : targetInformation     : X509v3 AC Targeting
+!Cname no-rev-avail
+id-ce 56               : noRevAvail            : X509v3 No Revocation Available
 
 !Cname netscape
 2 16 840 1 113730      : Netscape              : Netscape Communications Corp.
@@ -575,10 +593,10 @@ internet 5                : security              : Security
 internet 6             : snmpv2                : SNMPv2
 internet 7             : mail                  : Mail
 
-private 1              : enterprises           : Enterprises
+Private 1              : enterprises           : Enterprises
 
 # RFC 2247
-enterprises 1466 344   : dcobject              : dcObject
+Enterprises 1466 344   : dcobject              : dcObject
 
 # Stray OIDs we don't know the full name of each step for
 # RFC 2247