From 16dc1cfb5c303cd67c69003ff8aee48cae21b867 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bodo=20M=C3=B6ller?= Date: Fri, 2 Aug 2002 12:28:34 +0000 Subject: [PATCH] Add more WAP/WTLS elliptic curve OIDs. Submitted by: Douglas Stebila --- CHANGES | 7 +++++ crypto/objects/obj_dat.h | 54 +++++++++++++++++++++++++++++++++----- crypto/objects/obj_mac.h | 28 ++++++++++++++++++++ crypto/objects/obj_mac.num | 7 +++++ crypto/objects/objects.txt | 7 +++++ 5 files changed, 97 insertions(+), 6 deletions(-) diff --git a/CHANGES b/CHANGES index 1e876fccb8..8312f3d46b 100644 --- a/CHANGES +++ b/CHANGES @@ -4,6 +4,13 @@ Changes between 0.9.7 and 0.9.8 [xx XXX 2002] + *) Add more WAP/WTLS elliptic curve OIDs. + [Douglas Stebila ] + + *) Add new error code 'ERR_R_DISABLED' that can be used when some + functionality is disabled at compile-time. + [Douglas Stebila ] + *) Change default behaviour of 'openssl asn1parse' so that more information is visible when viewing, e.g., a certificate: diff --git a/crypto/objects/obj_dat.h b/crypto/objects/obj_dat.h index 2a4754e0c1..48bb6aa60e 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 709 -#define NUM_SN 704 -#define NUM_LN 704 -#define NUM_OBJ 678 +#define NUM_NID 716 +#define NUM_SN 711 +#define NUM_LN 711 +#define NUM_OBJ 685 -static unsigned char lvalues[4814]={ +static unsigned char lvalues[4849]={ 0x00, /* [ 0] OBJ_undef */ 0x2A,0x86,0x48,0x86,0xF7,0x0D, /* [ 1] OBJ_rsadsi */ 0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01, /* [ 7] OBJ_pkcs */ @@ -746,6 +746,13 @@ static unsigned char lvalues[4814]={ 0x67,0x2A,0x08,0xAE,0x7B, /* [4791] OBJ_set_brand_Novus */ 0x2A,0x86,0x48,0x86,0xF7,0x0D,0x03,0x0A, /* [4796] OBJ_des_cdmf */ 0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x06,/* [4804] OBJ_rsaOAEPEncryptionSET */ +0x67,0x2B,0x0D,0x04,0x03, /* [4813] OBJ_wap_wsg_idm_ecid_wtls3 */ +0x67,0x2B,0x0D,0x04,0x04, /* [4818] OBJ_wap_wsg_idm_ecid_wtls4 */ +0x67,0x2B,0x0D,0x04,0x05, /* [4823] OBJ_wap_wsg_idm_ecid_wtls5 */ +0x67,0x2B,0x0D,0x04,0x07, /* [4828] OBJ_wap_wsg_idm_ecid_wtls7 */ +0x67,0x2B,0x0D,0x04,0x0A, /* [4833] OBJ_wap_wsg_idm_ecid_wtls10 */ +0x67,0x2B,0x0D,0x04,0x0B, /* [4838] OBJ_wap_wsg_idm_ecid_wtls11 */ +0x67,0x2B,0x0D,0x04,0x0C, /* [4843] OBJ_wap_wsg_idm_ecid_wtls12 */ }; static ASN1_OBJECT nid_objs[NUM_NID]={ @@ -1852,6 +1859,20 @@ static ASN1_OBJECT nid_objs[NUM_NID]={ {"DES-CDMF","des-cdmf",NID_des_cdmf,8,&(lvalues[4796]),0}, {"rsaOAEPEncryptionSET","rsaOAEPEncryptionSET", NID_rsaOAEPEncryptionSET,9,&(lvalues[4804]),0}, +{"wap-wsg-idm-ecid-wtls3","wap-wsg-idm-ecid-wtls3", + NID_wap_wsg_idm_ecid_wtls3,5,&(lvalues[4813]),0}, +{"wap-wsg-idm-ecid-wtls4","wap-wsg-idm-ecid-wtls4", + NID_wap_wsg_idm_ecid_wtls4,5,&(lvalues[4818]),0}, +{"wap-wsg-idm-ecid-wtls5","wap-wsg-idm-ecid-wtls5", + NID_wap_wsg_idm_ecid_wtls5,5,&(lvalues[4823]),0}, +{"wap-wsg-idm-ecid-wtls7","wap-wsg-idm-ecid-wtls7", + NID_wap_wsg_idm_ecid_wtls7,5,&(lvalues[4828]),0}, +{"wap-wsg-idm-ecid-wtls10","wap-wsg-idm-ecid-wtls10", + NID_wap_wsg_idm_ecid_wtls10,5,&(lvalues[4833]),0}, +{"wap-wsg-idm-ecid-wtls11","wap-wsg-idm-ecid-wtls11", + NID_wap_wsg_idm_ecid_wtls11,5,&(lvalues[4838]),0}, +{"wap-wsg-idm-ecid-wtls12","wap-wsg-idm-ecid-wtls12", + NID_wap_wsg_idm_ecid_wtls12,5,&(lvalues[4843]),0}, }; static ASN1_OBJECT *sn_objs[NUM_SN]={ @@ -2553,7 +2574,14 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={ &(nid_objs[562]),/* "wap" */ &(nid_objs[563]),/* "wap-wsg" */ &(nid_objs[564]),/* "wap-wsg-idm-ecid-wtls1" */ +&(nid_objs[713]),/* "wap-wsg-idm-ecid-wtls10" */ +&(nid_objs[714]),/* "wap-wsg-idm-ecid-wtls11" */ +&(nid_objs[715]),/* "wap-wsg-idm-ecid-wtls12" */ +&(nid_objs[709]),/* "wap-wsg-idm-ecid-wtls3" */ +&(nid_objs[710]),/* "wap-wsg-idm-ecid-wtls4" */ +&(nid_objs[711]),/* "wap-wsg-idm-ecid-wtls5" */ &(nid_objs[565]),/* "wap-wsg-idm-ecid-wtls6" */ +&(nid_objs[712]),/* "wap-wsg-idm-ecid-wtls7" */ &(nid_objs[566]),/* "wap-wsg-idm-ecid-wtls8" */ &(nid_objs[567]),/* "wap-wsg-idm-ecid-wtls9" */ &(nid_objs[568]),/* "x500UniqueIdentifier" */ @@ -3259,7 +3287,14 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={ &(nid_objs[562]),/* "wap" */ &(nid_objs[563]),/* "wap-wsg" */ &(nid_objs[564]),/* "wap-wsg-idm-ecid-wtls1" */ +&(nid_objs[713]),/* "wap-wsg-idm-ecid-wtls10" */ +&(nid_objs[714]),/* "wap-wsg-idm-ecid-wtls11" */ +&(nid_objs[715]),/* "wap-wsg-idm-ecid-wtls12" */ +&(nid_objs[709]),/* "wap-wsg-idm-ecid-wtls3" */ +&(nid_objs[710]),/* "wap-wsg-idm-ecid-wtls4" */ +&(nid_objs[711]),/* "wap-wsg-idm-ecid-wtls5" */ &(nid_objs[565]),/* "wap-wsg-idm-ecid-wtls6" */ +&(nid_objs[712]),/* "wap-wsg-idm-ecid-wtls7" */ &(nid_objs[566]),/* "wap-wsg-idm-ecid-wtls8" */ &(nid_objs[567]),/* "wap-wsg-idm-ecid-wtls9" */ &(nid_objs[568]),/* "x500UniqueIdentifier" */ @@ -3274,8 +3309,8 @@ static ASN1_OBJECT *obj_objs[NUM_OBJ]={ &(nid_objs[434]),/* OBJ_data 0 9 */ &(nid_objs[181]),/* OBJ_iso 1 */ &(nid_objs[182]),/* OBJ_member_body 1 2 */ -&(nid_objs[527]),/* OBJ_identified_organization 1 3 */ &(nid_objs[379]),/* OBJ_org 1 3 */ +&(nid_objs[527]),/* OBJ_identified_organization 1 3 */ &(nid_objs[393]),/* OBJ_joint_iso_ccitt 2 */ &(nid_objs[11]),/* OBJ_X500 2 5 */ &(nid_objs[380]),/* OBJ_dod 1 3 6 */ @@ -3515,9 +3550,16 @@ static ASN1_OBJECT *obj_objs[NUM_OBJ]={ &(nid_objs[694]),/* OBJ_setAttr_IssCap_Sig 2 23 42 3 3 5 */ &(nid_objs[706]),/* OBJ_set_brand_Novus 2 23 42 8 6011 */ &(nid_objs[564]),/* OBJ_wap_wsg_idm_ecid_wtls1 2 23 43 13 4 1 */ +&(nid_objs[709]),/* OBJ_wap_wsg_idm_ecid_wtls3 2 23 43 13 4 3 */ +&(nid_objs[710]),/* OBJ_wap_wsg_idm_ecid_wtls4 2 23 43 13 4 4 */ +&(nid_objs[711]),/* OBJ_wap_wsg_idm_ecid_wtls5 2 23 43 13 4 5 */ &(nid_objs[565]),/* OBJ_wap_wsg_idm_ecid_wtls6 2 23 43 13 4 6 */ +&(nid_objs[712]),/* OBJ_wap_wsg_idm_ecid_wtls7 2 23 43 13 4 7 */ &(nid_objs[566]),/* OBJ_wap_wsg_idm_ecid_wtls8 2 23 43 13 4 8 */ &(nid_objs[567]),/* OBJ_wap_wsg_idm_ecid_wtls9 2 23 43 13 4 9 */ +&(nid_objs[713]),/* OBJ_wap_wsg_idm_ecid_wtls10 2 23 43 13 4 10 */ +&(nid_objs[714]),/* OBJ_wap_wsg_idm_ecid_wtls11 2 23 43 13 4 11 */ +&(nid_objs[715]),/* OBJ_wap_wsg_idm_ecid_wtls12 2 23 43 13 4 12 */ &(nid_objs[124]),/* OBJ_rle_compression 1 1 1 1 666 1 */ &(nid_objs[125]),/* OBJ_zlib_compression 1 1 1 1 666 2 */ &(nid_objs[ 1]),/* OBJ_rsadsi 1 2 840 113549 */ diff --git a/crypto/objects/obj_mac.h b/crypto/objects/obj_mac.h index 57034c0050..ff9951a272 100644 --- a/crypto/objects/obj_mac.h +++ b/crypto/objects/obj_mac.h @@ -426,10 +426,26 @@ #define NID_wap_wsg_idm_ecid_wtls1 564 #define OBJ_wap_wsg_idm_ecid_wtls1 OBJ_wap_wsg_idm_ecid,1L +#define SN_wap_wsg_idm_ecid_wtls3 "wap-wsg-idm-ecid-wtls3" +#define NID_wap_wsg_idm_ecid_wtls3 709 +#define OBJ_wap_wsg_idm_ecid_wtls3 OBJ_wap_wsg_idm_ecid,3L + +#define SN_wap_wsg_idm_ecid_wtls4 "wap-wsg-idm-ecid-wtls4" +#define NID_wap_wsg_idm_ecid_wtls4 710 +#define OBJ_wap_wsg_idm_ecid_wtls4 OBJ_wap_wsg_idm_ecid,4L + +#define SN_wap_wsg_idm_ecid_wtls5 "wap-wsg-idm-ecid-wtls5" +#define NID_wap_wsg_idm_ecid_wtls5 711 +#define OBJ_wap_wsg_idm_ecid_wtls5 OBJ_wap_wsg_idm_ecid,5L + #define SN_wap_wsg_idm_ecid_wtls6 "wap-wsg-idm-ecid-wtls6" #define NID_wap_wsg_idm_ecid_wtls6 565 #define OBJ_wap_wsg_idm_ecid_wtls6 OBJ_wap_wsg_idm_ecid,6L +#define SN_wap_wsg_idm_ecid_wtls7 "wap-wsg-idm-ecid-wtls7" +#define NID_wap_wsg_idm_ecid_wtls7 712 +#define OBJ_wap_wsg_idm_ecid_wtls7 OBJ_wap_wsg_idm_ecid,7L + #define SN_wap_wsg_idm_ecid_wtls8 "wap-wsg-idm-ecid-wtls8" #define NID_wap_wsg_idm_ecid_wtls8 566 #define OBJ_wap_wsg_idm_ecid_wtls8 OBJ_wap_wsg_idm_ecid,8L @@ -438,6 +454,18 @@ #define NID_wap_wsg_idm_ecid_wtls9 567 #define OBJ_wap_wsg_idm_ecid_wtls9 OBJ_wap_wsg_idm_ecid,9L +#define SN_wap_wsg_idm_ecid_wtls10 "wap-wsg-idm-ecid-wtls10" +#define NID_wap_wsg_idm_ecid_wtls10 713 +#define OBJ_wap_wsg_idm_ecid_wtls10 OBJ_wap_wsg_idm_ecid,10L + +#define SN_wap_wsg_idm_ecid_wtls11 "wap-wsg-idm-ecid-wtls11" +#define NID_wap_wsg_idm_ecid_wtls11 714 +#define OBJ_wap_wsg_idm_ecid_wtls11 OBJ_wap_wsg_idm_ecid,11L + +#define SN_wap_wsg_idm_ecid_wtls12 "wap-wsg-idm-ecid-wtls12" +#define NID_wap_wsg_idm_ecid_wtls12 715 +#define OBJ_wap_wsg_idm_ecid_wtls12 OBJ_wap_wsg_idm_ecid,12L + #define SN_cast5_cbc "CAST5-CBC" #define LN_cast5_cbc "cast5-cbc" #define NID_cast5_cbc 108 diff --git a/crypto/objects/obj_mac.num b/crypto/objects/obj_mac.num index 9f241b666b..9e756f12a2 100644 --- a/crypto/objects/obj_mac.num +++ b/crypto/objects/obj_mac.num @@ -706,3 +706,10 @@ set_brand_MasterCard 705 set_brand_Novus 706 des_cdmf 707 rsaOAEPEncryptionSET 708 +wap_wsg_idm_ecid_wtls3 709 +wap_wsg_idm_ecid_wtls4 710 +wap_wsg_idm_ecid_wtls5 711 +wap_wsg_idm_ecid_wtls7 712 +wap_wsg_idm_ecid_wtls10 713 +wap_wsg_idm_ecid_wtls11 714 +wap_wsg_idm_ecid_wtls12 715 diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt index b3eebada17..8ba8d006eb 100644 --- a/crypto/objects/objects.txt +++ b/crypto/objects/objects.txt @@ -111,9 +111,16 @@ secg-ellipticCurve 39 : sect571r1 # WAP/TLS curve OIDs (http://www.wapforum.org/) !Alias wap-wsg-idm-ecid wap-wsg 4 wap-wsg-idm-ecid 1 : wap-wsg-idm-ecid-wtls1 +wap-wsg-idm-ecid 3 : wap-wsg-idm-ecid-wtls3 +wap-wsg-idm-ecid 4 : wap-wsg-idm-ecid-wtls4 +wap-wsg-idm-ecid 5 : wap-wsg-idm-ecid-wtls5 wap-wsg-idm-ecid 6 : wap-wsg-idm-ecid-wtls6 +wap-wsg-idm-ecid 7 : wap-wsg-idm-ecid-wtls7 wap-wsg-idm-ecid 8 : wap-wsg-idm-ecid-wtls8 wap-wsg-idm-ecid 9 : wap-wsg-idm-ecid-wtls9 +wap-wsg-idm-ecid 10 : wap-wsg-idm-ecid-wtls10 +wap-wsg-idm-ecid 11 : wap-wsg-idm-ecid-wtls11 +wap-wsg-idm-ecid 12 : wap-wsg-idm-ecid-wtls12 ISO-US 113533 7 66 10 : CAST5-CBC : cast5-cbc -- 2.25.1