Skip to content

O
openssl

btwise / openssl

通知 1
Star 0
Fork 0
O
openssl

体验新版 GitCode，发现更多精彩内容 >>

提交 1d284535 编写于 作者: B Bodo Möller
浏览文件
操作

add OIDs for WAP/TLS curves

上级 690ecff7
隐藏空白更改
内联 并排
Showing with 87 addition and 12 deletion
crypto/objects/obj_dat.h
浏览文件 @ 1d284535
......@@ -62,12 +62,12 @@
* [including the GNU Public Licence.]
*/
#define NUM_NID 562
#define NUM_SN 560
#define NUM_LN 560
#define NUM_OBJ 534
#define NUM_NID 568
#define NUM_SN 566
#define NUM_LN 566
#define NUM_OBJ 540
static unsigned char lvalues[4193]={
static unsigned char lvalues[4218]={
0x00, /* [ 0] OBJ_undef */
0x2A,0x86,0x48,0x86,0xF7,0x0D, /* [ 1] OBJ_rsadsi */
0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01, /* [ 7] OBJ_pkcs */
......@@ -602,6 +602,12 @@ static unsigned char lvalues[4193]={
0x2B,0x81,0x04,0x00,0x25, /* [4177] OBJ_sect409r1 */
0x2B,0x81,0x04,0x00,0x26, /* [4182] OBJ_sect571k1 */
0x2B,0x81,0x04,0x00,0x27, /* [4187] OBJ_sect571r1 */
0x67,0x2B, /* [4192] OBJ_wap */
0x67,0x2B,0x0D, /* [4194] OBJ_wap_wsg */
0x67,0x2B,0x0D,0x04,0x01, /* [4197] OBJ_wap_wsg_idm_ecid_wtls1 */
0x67,0x2B,0x0D,0x04,0x06, /* [4202] OBJ_wap_wsg_idm_ecid_wtls6 */
0x67,0x2B,0x0D,0x04,0x08, /* [4207] OBJ_wap_wsg_idm_ecid_wtls8 */
0x67,0x2B,0x0D,0x04,0x09, /* [4212] OBJ_wap_wsg_idm_ecid_wtls9 */
};
static ASN1_OBJECT nid_objs[NUM_NID]={
......@@ -1435,6 +1441,16 @@ static ASN1_OBJECT nid_objs[NUM_NID]={
{"sect409r1","sect409r1",NID_sect409r1,5,&(lvalues[4177]),0},
{"sect571k1","sect571k1",NID_sect571k1,5,&(lvalues[4182]),0},
{"sect571r1","sect571r1",NID_sect571r1,5,&(lvalues[4187]),0},
{"wap","wap",NID_wap,2,&(lvalues[4192]),0},
{"wap-wsg","wap-wsg",NID_wap_wsg,3,&(lvalues[4194]),0},
{"wap-wsg-idm-ecid-wtls1","wap-wsg-idm-ecid-wtls1",
NID_wap_wsg_idm_ecid_wtls1,5,&(lvalues[4197]),0},
{"wap-wsg-idm-ecid-wtls6","wap-wsg-idm-ecid-wtls6",
NID_wap_wsg_idm_ecid_wtls6,5,&(lvalues[4202]),0},
{"wap-wsg-idm-ecid-wtls8","wap-wsg-idm-ecid-wtls8",
NID_wap_wsg_idm_ecid_wtls8,5,&(lvalues[4207]),0},
{"wap-wsg-idm-ecid-wtls9","wap-wsg-idm-ecid-wtls9",
NID_wap_wsg_idm_ecid_wtls9,5,&(lvalues[4212]),0},
};
static ASN1_OBJECT *sn_objs[NUM_SN]={
......@@ -1996,6 +2012,12 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={
&(nid_objs[49]),/* "unstructuredName" */
&(nid_objs[465]),/* "userClass" */
&(nid_objs[373]),/* "valid" */
&(nid_objs[562]),/* "wap" */
&(nid_objs[563]),/* "wap-wsg" */
&(nid_objs[564]),/* "wap-wsg-idm-ecid-wtls1" */
&(nid_objs[565]),/* "wap-wsg-idm-ecid-wtls6" */
&(nid_objs[566]),/* "wap-wsg-idm-ecid-wtls8" */
&(nid_objs[567]),/* "wap-wsg-idm-ecid-wtls9" */
&(nid_objs[158]),/* "x509Certificate" */
&(nid_objs[160]),/* "x509Crl" */
};
......@@ -2558,6 +2580,12 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={
&(nid_objs[465]),/* "userClass" */
&(nid_objs[458]),/* "userId" */
&(nid_objs[373]),/* "valid" */
&(nid_objs[562]),/* "wap" */
&(nid_objs[563]),/* "wap-wsg" */
&(nid_objs[564]),/* "wap-wsg-idm-ecid-wtls1" */
&(nid_objs[565]),/* "wap-wsg-idm-ecid-wtls6" */
&(nid_objs[566]),/* "wap-wsg-idm-ecid-wtls8" */
&(nid_objs[567]),/* "wap-wsg-idm-ecid-wtls9" */
&(nid_objs[158]),/* "x509Certificate" */
&(nid_objs[160]),/* "x509Crl" */
&(nid_objs[125]),/* "zlib compression" */
......@@ -2572,14 +2600,15 @@ 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[379]),/* OBJ_org 1 3 */
&(nid_objs[527]),/* OBJ_identified_organization 1 3 */
&(nid_objs[379]),/* OBJ_org 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 */
&(nid_objs[12]),/* OBJ_X509 2 5 4 */
&(nid_objs[378]),/* OBJ_X500algorithms 2 5 8 */
&(nid_objs[81]),/* OBJ_id_ce 2 5 29 */
&(nid_objs[562]),/* OBJ_wap 2 23 43 */
&(nid_objs[435]),/* OBJ_pss 0 9 2342 */
&(nid_objs[183]),/* OBJ_ISO_US 1 2 840 */
&(nid_objs[381]),/* OBJ_iana 1 3 6 1 */
......@@ -2619,6 +2648,7 @@ static ASN1_OBJECT *obj_objs[NUM_OBJ]={
&(nid_objs[126]),/* OBJ_ext_key_usage 2 5 29 37 */
&(nid_objs[402]),/* OBJ_target_information 2 5 29 55 */
&(nid_objs[403]),/* OBJ_no_rev_avail 2 5 29 56 */
&(nid_objs[563]),/* OBJ_wap_wsg 2 23 43 13 */
&(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 */
......@@ -2681,6 +2711,10 @@ static ASN1_OBJECT *obj_objs[NUM_OBJ]={
&(nid_objs[559]),/* OBJ_sect409r1 1 3 132 0 37 */
&(nid_objs[560]),/* OBJ_sect571k1 1 3 132 0 38 */
&(nid_objs[561]),/* OBJ_sect571r1 1 3 132 0 39 */
&(nid_objs[564]),/* OBJ_wap_wsg_idm_ecid_wtls1 2 23 43 13 4 1 */
&(nid_objs[565]),/* OBJ_wap_wsg_idm_ecid_wtls6 2 23 43 13 4 6 */
&(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[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 */
......
crypto/objects/obj_mac.h
浏览文件 @ 1d284535
......@@ -95,6 +95,14 @@
#define NID_certicom_arc 528
#define OBJ_certicom_arc OBJ_identified_organization,132L
#define SN_wap "wap"
#define NID_wap 562
#define OBJ_wap OBJ_joint_iso_ccitt,23L,43L
#define SN_wap_wsg "wap-wsg"
#define NID_wap_wsg 563
#define OBJ_wap_wsg OBJ_wap,13L
#define SN_selected_attribute_types "selected-attribute-types"
#define LN_selected_attribute_types "Selected Attribute Types"
#define NID_selected_attribute_types 394
......@@ -420,6 +428,24 @@
#define NID_sect571r1 561
#define OBJ_sect571r1 OBJ_secg_ellipticCurve,39L
#define OBJ_wap_wsg_idm_ecid OBJ_wap_wsg,4L
#define SN_wap_wsg_idm_ecid_wtls1 "wap-wsg-idm-ecid-wtls1"
#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_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_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
#define SN_wap_wsg_idm_ecid_wtls9 "wap-wsg-idm-ecid-wtls9"
#define NID_wap_wsg_idm_ecid_wtls9 567
#define OBJ_wap_wsg_idm_ecid_wtls9 OBJ_wap_wsg_idm_ecid,9L
#define SN_cast5_cbc "CAST5-CBC"
#define LN_cast5_cbc "cast5-cbc"
#define NID_cast5_cbc 108
......
crypto/objects/obj_mac.num
浏览文件 @ 1d284535
......@@ -559,3 +559,9 @@ sect409k1 558
sect409r1 559
sect571k1 560
sect571r1 561
wap 562
wap_wsg 563
wap_wsg_idm_ecid_wtls1 564
wap_wsg_idm_ecid_wtls6 565
wap_wsg_idm_ecid_wtls8 566
wap_wsg_idm_ecid_wtls9 567
crypto/objects/objects.txt
浏览文件 @ 1d284535
......@@ -10,6 +10,9 @@ iso 3 : identified-organization
identified-organization 132 : certicom-arc
joint-iso-ccitt 23 43 : wap
wap 13 : wap-wsg
joint-iso-ccitt 5 1 5 : selected-attribute-types : Selected Attribute Types
selected-attribute-types 55 : clearance
......@@ -68,12 +71,10 @@ X9-62_primeCurve 7 : prime256v1
!global
X9-62_id-ecSigType 1 : ecdsa-with-SHA1
# the following AsnOId are from the document
# "SEC 2: Recommended Elliptic Curve Domain Parameters"
# from the Standarts for Efficient Cryptography Group
# ( for more informations see : http://www.secg.org )
# SECG curve OIDs from "SEC 2: Recommended Elliptic Curve Domain Parameters"
# (http://www.secg.org/)
!Alias secg_ellipticCurve certicom-arc 0
# secg prime curves oids
# SECG prime curves OIDs
secg-ellipticCurve 6 : secp112r1
secg-ellipticCurve 7 : secp112r2
secg-ellipticCurve 28 : secp128r1
......@@ -89,7 +90,7 @@ secg-ellipticCurve 10 : secp256k1
X9_62_prime256v1 : secp256r1
secg-ellipticCurve 34 : secp384r1
secg-ellipticCurve 35 : secp521r1
# secg characteristic two curves oids
# SECG characteristic two curves OIDs
secg-ellipticCurve 4 : sect113r1
secg-ellipticCurve 5 : sect113r2
secg-ellipticCurve 22 : sect131r1
......@@ -109,6 +110,14 @@ secg-ellipticCurve 37 : sect409r1
secg-ellipticCurve 38 : sect571k1
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 6 : wap-wsg-idm-ecid-wtls6
wap-wsg-idm-ecid 8 : wap-wsg-idm-ecid-wtls8
wap-wsg-idm-ecid 9 : wap-wsg-idm-ecid-wtls9
ISO-US 113533 7 66 10 : CAST5-CBC : cast5-cbc
: CAST5-ECB : cast5-ecb
!Cname cast5-cfb64
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或