diff options
author | Dr. Stephen Henson <steve@openssl.org> | 2008-10-22 18:48:50 +0000 |
---|---|---|
committer | Dr. Stephen Henson <steve@openssl.org> | 2008-10-22 18:48:50 +0000 |
commit | ff09931e227101c1cfedd027a8d58a6a8d8a8db0 (patch) | |
tree | 5cbbcc595cad84101c1a40aeaaa83bd09d3e82b8 /crypto/objects | |
parent | 155c70b8824c83961d6306f00e129d58bb69239d (diff) |
Sync OIDS with HEAD.
Diffstat (limited to 'crypto/objects')
-rw-r--r-- | crypto/objects/obj_dat.h | 16 | ||||
-rw-r--r-- | crypto/objects/obj_mac.h | 5 | ||||
-rw-r--r-- | crypto/objects/obj_mac.num | 2 | ||||
-rw-r--r-- | crypto/objects/objects.txt | 3 |
4 files changed, 21 insertions, 5 deletions
diff --git a/crypto/objects/obj_dat.h b/crypto/objects/obj_dat.h index 0ccc7c62be..f27e4d0593 100644 --- a/crypto/objects/obj_dat.h +++ b/crypto/objects/obj_dat.h @@ -62,12 +62,12 @@ * [including the GNU Public Licence.] */ -#define NUM_NID 857 -#define NUM_SN 850 -#define NUM_LN 850 -#define NUM_OBJ 804 +#define NUM_NID 858 +#define NUM_SN 851 +#define NUM_LN 851 +#define NUM_OBJ 805 -static unsigned char lvalues[5711]={ +static unsigned char lvalues[5719]={ 0x00, /* [ 0] OBJ_undef */ 0x2A,0x86,0x48,0x86,0xF7,0x0D, /* [ 1] OBJ_rsadsi */ 0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01, /* [ 7] OBJ_pkcs */ @@ -872,6 +872,7 @@ static unsigned char lvalues[5711]={ 0x2A,0x85,0x03,0x02,0x09,0x01,0x03,0x04, /* [5685] OBJ_id_GostR3411_94_with_GostR3410_2001_cc */ 0x2A,0x85,0x03,0x02,0x09,0x01,0x08,0x01, /* [5693] OBJ_id_GostR3410_2001_ParamSet_cc */ 0x2B,0x06,0x01,0x04,0x01,0x82,0x37,0x11,0x02,/* [5701] OBJ_LocalKeySet */ +0x2B,0x06,0x01,0x05,0x05,0x07,0x08,0x03, /* [5710] OBJ_id_on_permanentIdentifier */ }; static ASN1_OBJECT nid_objs[NUM_NID]={ @@ -2256,6 +2257,8 @@ static ASN1_OBJECT nid_objs[NUM_NID]={ {"HMAC","hmac",NID_hmac,0,NULL,0}, {"LocalKeySet","Microsoft Local Key set",NID_LocalKeySet,9, &(lvalues[5701]),0}, +{"id-on-permanentIdentifier","Permanent Identifier", + NID_id_on_permanentIdentifier,8,&(lvalues[5710]),0}, }; static ASN1_OBJECT *sn_objs[NUM_SN]={ @@ -2678,6 +2681,7 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={ &(nid_objs[279]),/* "id-mod-qualified-cert-93" */ &(nid_objs[281]),/* "id-mod-timestamp-protocol" */ &(nid_objs[264]),/* "id-on" */ +&(nid_objs[857]),/* "id-on-permanentIdentifier" */ &(nid_objs[347]),/* "id-on-personalData" */ &(nid_objs[265]),/* "id-pda" */ &(nid_objs[352]),/* "id-pda-countryOfCitizenship" */ @@ -3200,6 +3204,7 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={ &(nid_objs[69]),/* "PBKDF2" */ &(nid_objs[162]),/* "PBMAC1" */ &(nid_objs[127]),/* "PKIX" */ +&(nid_objs[857]),/* "Permanent Identifier" */ &(nid_objs[164]),/* "Policy Qualifier CPS" */ &(nid_objs[165]),/* "Policy Qualifier User Notice" */ &(nid_objs[385]),/* "Private" */ @@ -4476,6 +4481,7 @@ static ASN1_OBJECT *obj_objs[NUM_OBJ]={ &(nid_objs[345]),/* OBJ_id_cmc_popLinkWitness 1 3 6 1 5 5 7 7 23 */ &(nid_objs[346]),/* OBJ_id_cmc_confirmCertAcceptance 1 3 6 1 5 5 7 7 24 */ &(nid_objs[347]),/* OBJ_id_on_personalData 1 3 6 1 5 5 7 8 1 */ +&(nid_objs[857]),/* OBJ_id_on_permanentIdentifier 1 3 6 1 5 5 7 8 3 */ &(nid_objs[348]),/* OBJ_id_pda_dateOfBirth 1 3 6 1 5 5 7 9 1 */ &(nid_objs[349]),/* OBJ_id_pda_placeOfBirth 1 3 6 1 5 5 7 9 2 */ &(nid_objs[351]),/* OBJ_id_pda_gender 1 3 6 1 5 5 7 9 3 */ diff --git a/crypto/objects/obj_mac.h b/crypto/objects/obj_mac.h index 05fcbe7aa1..50a5e761d7 100644 --- a/crypto/objects/obj_mac.h +++ b/crypto/objects/obj_mac.h @@ -1734,6 +1734,11 @@ #define NID_id_on_personalData 347 #define OBJ_id_on_personalData OBJ_id_on,1L +#define SN_id_on_permanentIdentifier "id-on-permanentIdentifier" +#define LN_id_on_permanentIdentifier "Permanent Identifier" +#define NID_id_on_permanentIdentifier 857 +#define OBJ_id_on_permanentIdentifier OBJ_id_on,3L + #define SN_id_pda_dateOfBirth "id-pda-dateOfBirth" #define NID_id_pda_dateOfBirth 348 #define OBJ_id_pda_dateOfBirth OBJ_id_pda,1L diff --git a/crypto/objects/obj_mac.num b/crypto/objects/obj_mac.num index 53c9cb0d6a..e3f56bc52c 100644 --- a/crypto/objects/obj_mac.num +++ b/crypto/objects/obj_mac.num @@ -854,3 +854,5 @@ id_GostR3411_94_with_GostR3410_2001_cc 853 id_GostR3410_2001_ParamSet_cc 854 hmac 855 LocalKeySet 856 +freshest_crl 857 +id_on_permanentIdentifier 858 diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt index e009702e55..a6a811b8e7 100644 --- a/crypto/objects/objects.txt +++ b/crypto/objects/objects.txt @@ -557,6 +557,7 @@ id-cmc 24 : id-cmc-confirmCertAcceptance # other names id-on 1 : id-on-personalData +id-on 3 : id-on-permanentIdentifier : Permanent Identifier # personal data attributes id-pda 1 : id-pda-dateOfBirth @@ -726,6 +727,8 @@ id-ce 35 : authorityKeyIdentifier : X509v3 Authority Key Identifier id-ce 36 : policyConstraints : X509v3 Policy Constraints !Cname ext-key-usage id-ce 37 : extendedKeyUsage : X509v3 Extended Key Usage +!Cname freshest-crl +id-ce 46 : freshestCRL : X509v3 Freshest CRL !Cname inhibit-any-policy id-ce 54 : inhibitAnyPolicy : X509v3 Inhibit Any Policy !Cname target-information |