wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add anyExtendedKeyUsage OID

Browse source
This commit is contained in:
Dr. Stephen Henson 2010-02-24 15:53:58 +00:00
parent 385a488c43
commit df4c395c6d
6 changed files with 26 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
crypto/objects/obj_dat.h
View file

@ -62,12 +62,12 @@
* [including the GNU Public Licence.] * [including the GNU Public Licence.]
*/ */
#define NUM_NID 910 #define NUM_NID 911
#define NUM_SN 903 #define NUM_SN 904
#define NUM_LN 903 #define NUM_LN 904
#define NUM_OBJ 853 #define NUM_OBJ 854
static const unsigned char lvalues[5949]={ static const unsigned char lvalues[5953]={
0x00, /* [ 0] OBJ_undef */ 0x00, /* [ 0] OBJ_undef */
0x2A,0x86,0x48,0x86,0xF7,0x0D, /* [ 1] OBJ_rsadsi */ 0x2A,0x86,0x48,0x86,0xF7,0x0D, /* [ 1] OBJ_rsadsi */
0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01, /* [ 7] OBJ_pkcs */ 0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01, /* [ 7] OBJ_pkcs */
@ -921,6 +921,7 @@ static const unsigned char lvalues[5949]={
0x2A,0x83,0x08,0x8C,0x9A,0x4B,0x3D,0x01,0x01,0x03,0x02,/* [5915] OBJ_id_camellia128_wrap */ 0x2A,0x83,0x08,0x8C,0x9A,0x4B,0x3D,0x01,0x01,0x03,0x02,/* [5915] OBJ_id_camellia128_wrap */
0x2A,0x83,0x08,0x8C,0x9A,0x4B,0x3D,0x01,0x01,0x03,0x03,/* [5926] OBJ_id_camellia192_wrap */ 0x2A,0x83,0x08,0x8C,0x9A,0x4B,0x3D,0x01,0x01,0x03,0x03,/* [5926] OBJ_id_camellia192_wrap */
0x2A,0x83,0x08,0x8C,0x9A,0x4B,0x3D,0x01,0x01,0x03,0x04,/* [5937] OBJ_id_camellia256_wrap */ 0x2A,0x83,0x08,0x8C,0x9A,0x4B,0x3D,0x01,0x01,0x03,0x04,/* [5937] OBJ_id_camellia256_wrap */
0x55,0x1D,0x25,0x00, /* [5948] OBJ_anyExtendedKeyUsage */
}; };
static const ASN1_OBJECT nid_objs[NUM_NID]={ static const ASN1_OBJECT nid_objs[NUM_NID]={
@ -2388,6 +2389,8 @@ static const ASN1_OBJECT nid_objs[NUM_NID]={
11,&(lvalues[5926]),0}, 11,&(lvalues[5926]),0},
{"id-camellia256-wrap","id-camellia256-wrap",NID_id_camellia256_wrap, {"id-camellia256-wrap","id-camellia256-wrap",NID_id_camellia256_wrap,
11,&(lvalues[5937]),0}, 11,&(lvalues[5937]),0},
{"anyExtendedKeyUsage","Any Extended Key Usage",
NID_anyExtendedKeyUsage,4,&(lvalues[5948]),0},
}; };
static const unsigned int sn_objs[NUM_SN]={ static const unsigned int sn_objs[NUM_SN]={
@ -2581,6 +2584,7 @@ static const unsigned int sn_objs[NUM_SN]={
363, /* "ad_timestamping" */ 363, /* "ad_timestamping" */
376, /* "algorithm" */ 376, /* "algorithm" */
405, /* "ansi-X9-62" */ 405, /* "ansi-X9-62" */
910, /* "anyExtendedKeyUsage" */
746, /* "anyPolicy" */ 746, /* "anyPolicy" */
370, /* "archiveCutoff" */ 370, /* "archiveCutoff" */
484, /* "associatedDomain" */ 484, /* "associatedDomain" */
@ -3300,6 +3304,7 @@ static const unsigned int ln_objs[NUM_LN]={
363, /* "AD Time Stamping" */ 363, /* "AD Time Stamping" */
405, /* "ANSI X9.62" */ 405, /* "ANSI X9.62" */
368, /* "Acceptable OCSP Responses" */ 368, /* "Acceptable OCSP Responses" */
910, /* "Any Extended Key Usage" */
664, /* "Any language" */ 664, /* "Any language" */
177, /* "Authority Information Access" */ 177, /* "Authority Information Access" */
365, /* "Basic OCSP Response" */ 365, /* "Basic OCSP Response" */
@ -4325,6 +4330,7 @@ static const unsigned int obj_objs[NUM_OBJ]={
96, /* OBJ_mdc2WithRSA 2 5 8 3 100 */ 96, /* OBJ_mdc2WithRSA 2 5 8 3 100 */
95, /* OBJ_mdc2 2 5 8 3 101 */ 95, /* OBJ_mdc2 2 5 8 3 101 */
746, /* OBJ_any_policy 2 5 29 32 0 */ 746, /* OBJ_any_policy 2 5 29 32 0 */
910, /* OBJ_anyExtendedKeyUsage 2 5 29 37 0 */
519, /* OBJ_setct_PANData 2 23 42 0 0 */ 519, /* OBJ_setct_PANData 2 23 42 0 0 */
520, /* OBJ_setct_PANToken 2 23 42 0 1 */ 520, /* OBJ_setct_PANToken 2 23 42 0 1 */
521, /* OBJ_setct_PANOnly 2 23 42 0 2 */ 521, /* OBJ_setct_PANOnly 2 23 42 0 2 */

5
crypto/objects/obj_mac.h
View file

@ -2403,6 +2403,11 @@
#define NID_no_rev_avail 403 #define NID_no_rev_avail 403
#define OBJ_no_rev_avail OBJ_id_ce,56L #define OBJ_no_rev_avail OBJ_id_ce,56L
#define SN_anyExtendedKeyUsage "anyExtendedKeyUsage"
#define LN_anyExtendedKeyUsage "Any Extended Key Usage"
#define NID_anyExtendedKeyUsage 910
#define OBJ_anyExtendedKeyUsage OBJ_ext_key_usage,0L
#define SN_netscape "Netscape" #define SN_netscape "Netscape"
#define LN_netscape "Netscape Communications Corp." #define LN_netscape "Netscape Communications Corp."
#define NID_netscape 57 #define NID_netscape 57

1
crypto/objects/obj_mac.num
View file

@ -907,3 +907,4 @@ aes_256_ctr 906
id_camellia128_wrap 907 id_camellia128_wrap 907
id_camellia192_wrap 908 id_camellia192_wrap 908
id_camellia256_wrap 909 id_camellia256_wrap 909
anyExtendedKeyUsage 910

4
crypto/objects/objects.txt
View file

@ -771,6 +771,10 @@ id-ce 55 : targetInformation : X509v3 AC Targeting
!Cname no-rev-avail !Cname no-rev-avail
id-ce 56 : noRevAvail : X509v3 No Revocation Available id-ce 56 : noRevAvail : X509v3 No Revocation Available
# From RFC5280
ext-key-usage 0 : anyExtendedKeyUsage : Any Extended Key Usage
!Cname netscape !Cname netscape
2 16 840 1 113730 : Netscape : Netscape Communications Corp. 2 16 840 1 113730 : Netscape : Netscape Communications Corp.
!Cname netscape-cert-extension !Cname netscape-cert-extension

4
crypto/x509v3/v3_purp.c
View file

@ -447,6 +447,10 @@ static void x509v3_cache_extensions(X509 *x)
case NID_dvcs: case NID_dvcs:
x->ex_xkusage |= XKU_DVCS; x->ex_xkusage |= XKU_DVCS;
break; break;
case NID_anyExtendedKeyUsage:
x->ex_xkusage |= XKU_ANYEKU;
break;
} }
} }
sk_ASN1_OBJECT_pop_free(extusage, ASN1_OBJECT_free); sk_ASN1_OBJECT_pop_free(extusage, ASN1_OBJECT_free);

1
crypto/x509v3/x509v3.h
View file

@ -451,6 +451,7 @@ struct ISSUING_DIST_POINT_st
#define XKU_OCSP_SIGN 0x20 #define XKU_OCSP_SIGN 0x20
#define XKU_TIMESTAMP 0x40 #define XKU_TIMESTAMP 0x40
#define XKU_DVCS 0x80 #define XKU_DVCS 0x80
#define XKU_ANYEKU 0x100
#define X509_PURPOSE_DYNAMIC 0x1 #define X509_PURPOSE_DYNAMIC 0x1
#define X509_PURPOSE_DYNAMIC_NAME 0x2 #define X509_PURPOSE_DYNAMIC_NAME 0x2