'flags' should only be set inside DSO_load() if constructing a new DSO

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

diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt
index 1e51416c73d67a6e0310cbcfab1ea5d3c8a6b7bb..b6519a67d2eec418120a749e44ebdb4f17e831ea 100644 (file)
--- a/crypto/objects/objects.txt
+++ b/crypto/objects/objects.txt
@@ -2,8 +2,14 @@
 
 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 ?
@@ -54,6 +60,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
 
@@ -201,6 +208,8 @@ id-smime-cti 6              : id-smime-cti-ets-proofOfCreation
 
 pkcs9 20               :                       : friendlyName
 pkcs9 21               :                       : localKeyID
+!Cname ms-csp-name
+1 3 6 1 4 1 311 17 1   : CSPName               : Microsoft CSP Name
 !Alias certTypes pkcs9 22
 certTypes 1            :                       : x509Certificate
 certTypes 2            :                       : sdsiCertificate
@@ -330,6 +339,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
@@ -424,17 +436,19 @@ 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
+id-pda 6               : id-pda-pseudonym
 
 # 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
@@ -484,7 +498,9 @@ algorithm 11                : rsaSignature
 algorithm 12           : DSA-old               : dsaEncryption-old
 algorithm 13           : DSA-SHA               : dsaWithSHA
 algorithm 15           : RSA-SHA               : shaWithRSAEncryption
+!Cname des-ede-ecb
 algorithm 17           : DES-EDE               : des-ede
+!Cname des-ede3-ecb
                        : DES-EDE3              : des-ede3
                        : DES-EDE-CBC           : des-ede-cbc
 !Cname des-ede-cfb64
@@ -526,6 +542,7 @@ X509 42                     : G                     : givenName
 X509 43                        : I                     : initials
 X509 45                        : UID                   : uniqueIdentifier
 X509 46                        : dnQualifier           : dnQualifier
+X509 72                        : role                  : role
 
 X500 8                 : X500algorithms        : directory services - algorithms
 X500algorithms 1 1     : RSA                   : rsa
@@ -559,8 +576,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.