diff options
author | Richard Levitte <levitte@openssl.org> | 2001-10-10 07:56:20 +0000 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2001-10-10 07:56:20 +0000 |
commit | b30245dae091a20c5c7e4fdcbfebd6853d95156f (patch) | |
tree | a122831f4268a312b921f187a32b2bbcd9b037ac /crypto/objects | |
parent | 116daf4c2f20b43a7ea349fcff407a4c85943d65 (diff) |
'make update'
Diffstat (limited to 'crypto/objects')
-rw-r--r-- | crypto/objects/obj_dat.h | 67 | ||||
-rw-r--r-- | crypto/objects/obj_mac.h | 47 | ||||
-rw-r--r-- | crypto/objects/obj_mac.num | 10 |
3 files changed, 119 insertions, 5 deletions
diff --git a/crypto/objects/obj_dat.h b/crypto/objects/obj_dat.h index 8e731bdb59..9e377ac22a 100644 --- a/crypto/objects/obj_dat.h +++ b/crypto/objects/obj_dat.h @@ -61,12 +61,12 @@ * perl obj_dat.pl obj_mac.h obj_dat.h */ -#define NUM_NID 493 -#define NUM_SN 491 -#define NUM_LN 491 -#define NUM_OBJ 465 +#define NUM_NID 503 +#define NUM_SN 501 +#define NUM_LN 501 +#define NUM_OBJ 475 -static unsigned char lvalues[3792]={ +static unsigned char lvalues[3836]={ 0x00, /* [ 0] OBJ_undef */ 0x2A,0x86,0x48,0x86,0xF7,0x0D, /* [ 1] OBJ_rsadsi */ 0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01, /* [ 7] OBJ_pkcs */ @@ -532,6 +532,16 @@ static unsigned char lvalues[3792]={ 0x2A,0x86,0x48,0xCE,0x3D,0x03,0x01,0x07, /* [3767] OBJ_X9_62_prime256v1 */ 0x2A,0x86,0x48,0xCE,0x3D,0x04,0x01, /* [3775] OBJ_ecdsa_with_SHA1 */ 0x2B,0x06,0x01,0x04,0x01,0x82,0x37,0x11,0x01,/* [3782] OBJ_ms_csp_name */ +0x50, /* [3791] OBJ_joint_iso_ccitt */ +0x55,0x01,0x05, /* [3792] OBJ_selected_attribute_types */ +0x55,0x01,0x05,0x37, /* [3795] OBJ_clearance */ +0x2B,0x06,0x01,0x05,0x05,0x07,0x01,0x0A, /* [3799] OBJ_ac_proxying */ +0x2B,0x06,0x01,0x05,0x05,0x07,0x01,0x0B, /* [3807] OBJ_sinfo_access */ +0x2B,0x06,0x01,0x05,0x05,0x07,0x0A,0x06, /* [3815] OBJ_id_aca_encAttrs */ +0x55,0x04,0x48, /* [3823] OBJ_role */ +0x55,0x1D,0x24, /* [3826] OBJ_policy_constraints */ +0x55,0x1D,0x37, /* [3829] OBJ_target_information */ +0x55,0x1D,0x38, /* [3832] OBJ_no_rev_avail */ }; static ASN1_OBJECT nid_objs[NUM_NID]={ @@ -1286,6 +1296,23 @@ static ASN1_OBJECT nid_objs[NUM_NID]={ {"ecdsa-with-SHA1","ecdsa-with-SHA1",NID_ecdsa_with_SHA1,7, &(lvalues[3775]),0}, {"CSPName","Microsoft CSP Name",NID_ms_csp_name,9,&(lvalues[3782]),0}, +{"JOINT-ISO-CCITT","joint-iso-ccitt",NID_joint_iso_ccitt,1, + &(lvalues[3791]),0}, +{"selected-attribute-types","Selected Attribute Types", + NID_selected_attribute_types,3,&(lvalues[3792]),0}, +{"clearance","clearance",NID_clearance,4,&(lvalues[3795]),0}, +{"ac-proxying","ac-proxying",NID_ac_proxying,8,&(lvalues[3799]),0}, +{"subjectInfoAccess","Subject Information Access",NID_sinfo_access,8, + &(lvalues[3807]),0}, +{"id-aca-encAttrs","id-aca-encAttrs",NID_id_aca_encAttrs,8, + &(lvalues[3815]),0}, +{"role","role",NID_role,3,&(lvalues[3823]),0}, +{"policyConstraints","X509v3 Policy Constraints", + NID_policy_constraints,3,&(lvalues[3826]),0}, +{"targetInformation","X509v3 AC Targeting",NID_target_information,3, + &(lvalues[3829]),0}, +{"noRevAvail","X509v3 No Revocation Available",NID_no_rev_avail,3, + &(lvalues[3832]),0}, }; static ASN1_OBJECT *sn_objs[NUM_SN]={ @@ -1348,6 +1375,7 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={ &(nid_objs[46]),/* "IDEA-OFB" */ &(nid_objs[181]),/* "ISO" */ &(nid_objs[183]),/* "ISO-US" */ +&(nid_objs[493]),/* "JOINT-ISO-CCITT" */ &(nid_objs[15]),/* "L" */ &(nid_objs[ 3]),/* "MD2" */ &(nid_objs[257]),/* "MD4" */ @@ -1420,6 +1448,7 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={ &(nid_objs[455]),/* "aRecord" */ &(nid_objs[289]),/* "aaControls" */ &(nid_objs[287]),/* "ac-auditEntity" */ +&(nid_objs[496]),/* "ac-proxying" */ &(nid_objs[288]),/* "ac-targeting" */ &(nid_objs[368]),/* "acceptableResponses" */ &(nid_objs[423]),/* "account" */ @@ -1443,6 +1472,7 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={ &(nid_objs[89]),/* "certificatePolicies" */ &(nid_objs[54]),/* "challengePassword" */ &(nid_objs[482]),/* "characteristic-two-field" */ +&(nid_objs[495]),/* "clearance" */ &(nid_objs[130]),/* "clientAuth" */ &(nid_objs[131]),/* "codeSigning" */ &(nid_objs[50]),/* "contentType" */ @@ -1494,6 +1524,7 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={ &(nid_objs[355]),/* "id-aca-accessIdentity" */ &(nid_objs[354]),/* "id-aca-authenticationInfo" */ &(nid_objs[356]),/* "id-aca-chargingIdentity" */ +&(nid_objs[498]),/* "id-aca-encAttrs" */ &(nid_objs[357]),/* "id-aca-group" */ &(nid_objs[358]),/* "id-aca-role" */ &(nid_objs[176]),/* "id-ad" */ @@ -1686,6 +1717,7 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={ &(nid_objs[458]),/* "nSRecord" */ &(nid_objs[173]),/* "name" */ &(nid_objs[369]),/* "noCheck" */ +&(nid_objs[502]),/* "noRevAvail" */ &(nid_objs[72]),/* "nsBaseUrl" */ &(nid_objs[76]),/* "nsCaPolicyUrl" */ &(nid_objs[74]),/* "nsCaRevocationUrl" */ @@ -1729,6 +1761,7 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={ &(nid_objs[22]),/* "pkcs7-signedData" */ &(nid_objs[151]),/* "pkcs8ShroudedKeyBag" */ &(nid_objs[47]),/* "pkcs9" */ +&(nid_objs[500]),/* "policyConstraints" */ &(nid_objs[481]),/* "prime-field" */ &(nid_objs[484]),/* "prime192v1" */ &(nid_objs[485]),/* "prime192v2" */ @@ -1744,6 +1777,7 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={ &(nid_objs[434]),/* "qualityLabelledData" */ &(nid_objs[427]),/* "rFC822localPart" */ &(nid_objs[437]),/* "rfc822Mailbox" */ +&(nid_objs[499]),/* "role" */ &(nid_objs[425]),/* "room" */ &(nid_objs[440]),/* "roomNumber" */ &(nid_objs[ 6]),/* "rsaEncryption" */ @@ -1758,6 +1792,7 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={ &(nid_objs[154]),/* "secretBag" */ &(nid_objs[451]),/* "secretary" */ &(nid_objs[386]),/* "security" */ +&(nid_objs[494]),/* "selected-attribute-types" */ &(nid_objs[129]),/* "serverAuth" */ &(nid_objs[371]),/* "serviceLocator" */ &(nid_objs[52]),/* "signingTime" */ @@ -1765,9 +1800,11 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={ &(nid_objs[473]),/* "singleLevelQuality" */ &(nid_objs[387]),/* "snmpv2" */ &(nid_objs[85]),/* "subjectAltName" */ +&(nid_objs[497]),/* "subjectInfoAccess" */ &(nid_objs[82]),/* "subjectKeyIdentifier" */ &(nid_objs[475]),/* "subtreeMaximumQuality" */ &(nid_objs[474]),/* "subtreeMinimumQuality" */ +&(nid_objs[501]),/* "targetInformation" */ &(nid_objs[436]),/* "textEncodedORAddress" */ &(nid_objs[293]),/* "textNotice" */ &(nid_objs[133]),/* "timeStamping" */ @@ -1850,12 +1887,15 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={ &(nid_objs[167]),/* "S/MIME Capabilities" */ &(nid_objs[387]),/* "SNMPv2" */ &(nid_objs[386]),/* "Security" */ +&(nid_objs[494]),/* "Selected Attribute Types" */ &(nid_objs[143]),/* "Strong Extranet ID" */ +&(nid_objs[497]),/* "Subject Information Access" */ &(nid_objs[130]),/* "TLS Web Client Authentication" */ &(nid_objs[129]),/* "TLS Web Server Authentication" */ &(nid_objs[133]),/* "Time Stamping" */ &(nid_objs[375]),/* "Trust Root" */ &(nid_objs[12]),/* "X509" */ +&(nid_objs[501]),/* "X509v3 AC Targeting" */ &(nid_objs[90]),/* "X509v3 Authority Key Identifier" */ &(nid_objs[87]),/* "X509v3 Basic Constraints" */ &(nid_objs[103]),/* "X509v3 CRL Distribution Points" */ @@ -1866,6 +1906,8 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={ &(nid_objs[126]),/* "X509v3 Extended Key Usage" */ &(nid_objs[86]),/* "X509v3 Issuer Alternative Name" */ &(nid_objs[83]),/* "X509v3 Key Usage" */ +&(nid_objs[502]),/* "X509v3 No Revocation Available" */ +&(nid_objs[500]),/* "X509v3 Policy Constraints" */ &(nid_objs[84]),/* "X509v3 Private Key Usage Period" */ &(nid_objs[85]),/* "X509v3 Subject Alternative Name" */ &(nid_objs[82]),/* "X509v3 Subject Key Identifier" */ @@ -1874,6 +1916,7 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={ &(nid_objs[455]),/* "aRecord" */ &(nid_objs[289]),/* "aaControls" */ &(nid_objs[287]),/* "ac-auditEntity" */ +&(nid_objs[496]),/* "ac-proxying" */ &(nid_objs[288]),/* "ac-targeting" */ &(nid_objs[423]),/* "account" */ &(nid_objs[364]),/* "ad dvcs" */ @@ -1908,6 +1951,7 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={ &(nid_objs[152]),/* "certBag" */ &(nid_objs[54]),/* "challengePassword" */ &(nid_objs[482]),/* "characteristic-two-field" */ +&(nid_objs[495]),/* "clearance" */ &(nid_objs[13]),/* "commonName" */ &(nid_objs[50]),/* "contentType" */ &(nid_objs[53]),/* "countersignature" */ @@ -1971,6 +2015,7 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={ &(nid_objs[355]),/* "id-aca-accessIdentity" */ &(nid_objs[354]),/* "id-aca-authenticationInfo" */ &(nid_objs[356]),/* "id-aca-chargingIdentity" */ +&(nid_objs[498]),/* "id-aca-encAttrs" */ &(nid_objs[357]),/* "id-aca-group" */ &(nid_objs[358]),/* "id-aca-role" */ &(nid_objs[176]),/* "id-ad" */ @@ -2140,6 +2185,7 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={ &(nid_objs[101]),/* "initials" */ &(nid_objs[181]),/* "iso" */ &(nid_objs[469]),/* "janetMailbox" */ +&(nid_objs[493]),/* "joint-iso-ccitt" */ &(nid_objs[150]),/* "keyBag" */ &(nid_objs[454]),/* "lastModifiedBy" */ &(nid_objs[453]),/* "lastModifiedTime" */ @@ -2233,6 +2279,7 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={ &(nid_objs[437]),/* "rfc822Mailbox" */ &(nid_objs[117]),/* "ripemd160" */ &(nid_objs[119]),/* "ripemd160WithRSA" */ +&(nid_objs[499]),/* "role" */ &(nid_objs[425]),/* "room" */ &(nid_objs[440]),/* "roomNumber" */ &(nid_objs[19]),/* "rsa" */ @@ -2284,6 +2331,7 @@ static ASN1_OBJECT *obj_objs[NUM_OBJ]={ &(nid_objs[181]),/* OBJ_iso 1 */ &(nid_objs[182]),/* OBJ_member_body 1 2 */ &(nid_objs[379]),/* OBJ_org 1 3 */ +&(nid_objs[493]),/* OBJ_joint_iso_ccitt 2 */ &(nid_objs[11]),/* OBJ_X500 2 5 */ &(nid_objs[380]),/* OBJ_dod 1 3 6 */ &(nid_objs[12]),/* OBJ_X509 2 5 4 */ @@ -2292,6 +2340,7 @@ static ASN1_OBJECT *obj_objs[NUM_OBJ]={ &(nid_objs[412]),/* OBJ_pss 0 9 2342 */ &(nid_objs[183]),/* OBJ_ISO_US 1 2 840 */ &(nid_objs[381]),/* OBJ_iana 1 3 6 1 */ +&(nid_objs[494]),/* OBJ_selected_attribute_types 2 5 1 5 */ &(nid_objs[13]),/* OBJ_commonName 2 5 4 3 */ &(nid_objs[100]),/* OBJ_surname 2 5 4 4 */ &(nid_objs[105]),/* OBJ_serialNumber 2 5 4 5 */ @@ -2307,6 +2356,7 @@ static ASN1_OBJECT *obj_objs[NUM_OBJ]={ &(nid_objs[101]),/* OBJ_initials 2 5 4 43 */ &(nid_objs[102]),/* OBJ_uniqueIdentifier 2 5 4 45 */ &(nid_objs[174]),/* OBJ_dnQualifier 2 5 4 46 */ +&(nid_objs[499]),/* OBJ_role 2 5 4 72 */ &(nid_objs[82]),/* OBJ_subject_key_identifier 2 5 29 14 */ &(nid_objs[83]),/* OBJ_key_usage 2 5 29 15 */ &(nid_objs[84]),/* OBJ_private_key_usage_period 2 5 29 16 */ @@ -2321,7 +2371,10 @@ static ASN1_OBJECT *obj_objs[NUM_OBJ]={ &(nid_objs[103]),/* OBJ_crl_distribution_points 2 5 29 31 */ &(nid_objs[89]),/* OBJ_certificate_policies 2 5 29 32 */ &(nid_objs[90]),/* OBJ_authority_key_identifier 2 5 29 35 */ +&(nid_objs[500]),/* OBJ_policy_constraints 2 5 29 36 */ &(nid_objs[126]),/* OBJ_ext_key_usage 2 5 29 37 */ +&(nid_objs[501]),/* OBJ_target_information 2 5 29 55 */ +&(nid_objs[502]),/* OBJ_no_rev_avail 2 5 29 56 */ &(nid_objs[390]),/* OBJ_dcObject 1466 344 */ &(nid_objs[382]),/* OBJ_Directory 1 3 6 1 1 */ &(nid_objs[383]),/* OBJ_Management 1 3 6 1 2 */ @@ -2331,6 +2384,7 @@ static ASN1_OBJECT *obj_objs[NUM_OBJ]={ &(nid_objs[387]),/* OBJ_SNMPv2 1 3 6 1 6 */ &(nid_objs[388]),/* OBJ_Mail 1 3 6 1 7 */ &(nid_objs[376]),/* OBJ_algorithm 1 3 14 3 2 */ +&(nid_objs[495]),/* OBJ_clearance 2 5 1 5 55 */ &(nid_objs[19]),/* OBJ_rsa 2 5 8 1 1 */ &(nid_objs[96]),/* OBJ_mdc2WithRSA 2 5 8 3 100 */ &(nid_objs[95]),/* OBJ_mdc2 2 5 8 3 101 */ @@ -2430,6 +2484,8 @@ static ASN1_OBJECT *obj_objs[NUM_OBJ]={ &(nid_objs[290]),/* OBJ_sbqp_ipAddrBlock 1 3 6 1 5 5 7 1 7 */ &(nid_objs[291]),/* OBJ_sbqp_autonomousSysNum 1 3 6 1 5 5 7 1 8 */ &(nid_objs[292]),/* OBJ_sbqp_routerIdentifier 1 3 6 1 5 5 7 1 9 */ +&(nid_objs[496]),/* OBJ_ac_proxying 1 3 6 1 5 5 7 1 10 */ +&(nid_objs[497]),/* OBJ_sinfo_access 1 3 6 1 5 5 7 1 11 */ &(nid_objs[164]),/* OBJ_id_qt_cps 1 3 6 1 5 5 7 2 1 */ &(nid_objs[165]),/* OBJ_id_qt_unotice 1 3 6 1 5 5 7 2 2 */ &(nid_objs[293]),/* OBJ_textNotice 1 3 6 1 5 5 7 2 3 */ @@ -2496,6 +2552,7 @@ static ASN1_OBJECT *obj_objs[NUM_OBJ]={ &(nid_objs[356]),/* OBJ_id_aca_chargingIdentity 1 3 6 1 5 5 7 10 3 */ &(nid_objs[357]),/* OBJ_id_aca_group 1 3 6 1 5 5 7 10 4 */ &(nid_objs[358]),/* OBJ_id_aca_role 1 3 6 1 5 5 7 10 5 */ +&(nid_objs[498]),/* OBJ_id_aca_encAttrs 1 3 6 1 5 5 7 10 6 */ &(nid_objs[359]),/* OBJ_id_qcs_pkixQCSyntax_v1 1 3 6 1 5 5 7 11 1 */ &(nid_objs[360]),/* OBJ_id_cct_crs 1 3 6 1 5 5 7 12 1 */ &(nid_objs[361]),/* OBJ_id_cct_PKIData 1 3 6 1 5 5 7 12 2 */ diff --git a/crypto/objects/obj_mac.h b/crypto/objects/obj_mac.h index 725efdb62a..697b90833c 100644 --- a/crypto/objects/obj_mac.h +++ b/crypto/objects/obj_mac.h @@ -76,11 +76,25 @@ #define NID_iso 181 #define OBJ_iso 1L +#define SN_joint_iso_ccitt "JOINT-ISO-CCITT" +#define LN_joint_iso_ccitt "joint-iso-ccitt" +#define NID_joint_iso_ccitt 493 +#define OBJ_joint_iso_ccitt 2L + #define SN_member_body "member-body" #define LN_member_body "ISO Member Body" #define NID_member_body 182 #define OBJ_member_body OBJ_iso,2L +#define SN_selected_attribute_types "selected-attribute-types" +#define LN_selected_attribute_types "Selected Attribute Types" +#define NID_selected_attribute_types 494 +#define OBJ_selected_attribute_types OBJ_joint_iso_ccitt,5L,1L,5L + +#define SN_clearance "clearance" +#define NID_clearance 495 +#define OBJ_clearance OBJ_selected_attribute_types,55L + #define SN_ISO_US "ISO-US" #define LN_ISO_US "ISO US Member Body" #define NID_ISO_US 183 @@ -1027,6 +1041,15 @@ #define NID_sbqp_routerIdentifier 292 #define OBJ_sbqp_routerIdentifier OBJ_id_pe,9L +#define SN_ac_proxying "ac-proxying" +#define NID_ac_proxying 496 +#define OBJ_ac_proxying OBJ_id_pe,10L + +#define SN_sinfo_access "subjectInfoAccess" +#define LN_sinfo_access "Subject Information Access" +#define NID_sinfo_access 497 +#define OBJ_sinfo_access OBJ_id_pe,11L + #define SN_id_qt_cps "id-qt-cps" #define LN_id_qt_cps "Policy Qualifier CPS" #define NID_id_qt_cps 164 @@ -1335,6 +1358,10 @@ #define NID_id_aca_role 358 #define OBJ_id_aca_role OBJ_id_aca,5L +#define SN_id_aca_encAttrs "id-aca-encAttrs" +#define NID_id_aca_encAttrs 498 +#define OBJ_id_aca_encAttrs OBJ_id_aca,6L + #define SN_id_qcs_pkixQCSyntax_v1 "id-qcs-pkixQCSyntax-v1" #define NID_id_qcs_pkixQCSyntax_v1 359 #define OBJ_id_qcs_pkixQCSyntax_v1 OBJ_id_qcs,1L @@ -1627,6 +1654,11 @@ #define NID_dnQualifier 174 #define OBJ_dnQualifier OBJ_X509,46L +#define SN_role "role" +#define LN_role "role" +#define NID_role 499 +#define OBJ_role OBJ_X509,72L + #define SN_X500algorithms "X500algorithms" #define LN_X500algorithms "directory services - algorithms" #define NID_X500algorithms 378 @@ -1716,11 +1748,26 @@ #define NID_authority_key_identifier 90 #define OBJ_authority_key_identifier OBJ_id_ce,35L +#define SN_policy_constraints "policyConstraints" +#define LN_policy_constraints "X509v3 Policy Constraints" +#define NID_policy_constraints 500 +#define OBJ_policy_constraints OBJ_id_ce,36L + #define SN_ext_key_usage "extendedKeyUsage" #define LN_ext_key_usage "X509v3 Extended Key Usage" #define NID_ext_key_usage 126 #define OBJ_ext_key_usage OBJ_id_ce,37L +#define SN_target_information "targetInformation" +#define LN_target_information "X509v3 AC Targeting" +#define NID_target_information 501 +#define OBJ_target_information OBJ_id_ce,55L + +#define SN_no_rev_avail "noRevAvail" +#define LN_no_rev_avail "X509v3 No Revocation Available" +#define NID_no_rev_avail 502 +#define OBJ_no_rev_avail OBJ_id_ce,56L + #define SN_netscape "Netscape" #define LN_netscape "Netscape Communications Corp." #define NID_netscape 57 diff --git a/crypto/objects/obj_mac.num b/crypto/objects/obj_mac.num index b2865434cd..44891f1117 100644 --- a/crypto/objects/obj_mac.num +++ b/crypto/objects/obj_mac.num @@ -490,3 +490,13 @@ X9_62_prime239v3 489 X9_62_prime256v1 490 ecdsa_with_SHA1 491 ms_csp_name 492 +joint_iso_ccitt 493 +selected_attribute_types 494 +clearance 495 +ac_proxying 496 +sinfo_access 497 +id_aca_encAttrs 498 +role 499 +policy_constraints 500 +target_information 501 +no_rev_avail 502 |