Initial experimental support for X9.42 DH parameter format to handle
RFC5114 parameters and X9.42 DH public and private keys.
This commit is contained in:
@@ -62,12 +62,12 @@
|
||||
* [including the GNU Public Licence.]
|
||||
*/
|
||||
|
||||
#define NUM_NID 919
|
||||
#define NUM_SN 912
|
||||
#define NUM_LN 912
|
||||
#define NUM_OBJ 856
|
||||
#define NUM_NID 920
|
||||
#define NUM_SN 913
|
||||
#define NUM_LN 913
|
||||
#define NUM_OBJ 857
|
||||
|
||||
static const unsigned char lvalues[5971]={
|
||||
static const unsigned char lvalues[5978]={
|
||||
0x00, /* [ 0] OBJ_undef */
|
||||
0x2A,0x86,0x48,0x86,0xF7,0x0D, /* [ 1] OBJ_rsadsi */
|
||||
0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01, /* [ 7] OBJ_pkcs */
|
||||
@@ -924,6 +924,7 @@ static const unsigned char lvalues[5971]={
|
||||
0x55,0x1D,0x25,0x00, /* [5948] OBJ_anyExtendedKeyUsage */
|
||||
0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x08,/* [5952] OBJ_mgf1 */
|
||||
0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x0A,/* [5961] OBJ_rsassaPss */
|
||||
0x2A,0x86,0x48,0xCE,0x3E,0x02,0x01, /* [5970] OBJ_dhpublicnumber */
|
||||
};
|
||||
|
||||
static const ASN1_OBJECT nid_objs[NUM_NID]={
|
||||
@@ -2404,6 +2405,7 @@ static const ASN1_OBJECT nid_objs[NUM_NID]={
|
||||
NID_aes_192_cbc_hmac_sha1,0,NULL,0},
|
||||
{"AES-256-CBC-HMAC-SHA1","aes-256-cbc-hmac-sha1",
|
||||
NID_aes_256_cbc_hmac_sha1,0,NULL,0},
|
||||
{"dhpublicnumber","X9.42 DH",NID_dhpublicnumber,7,&(lvalues[5970]),0},
|
||||
};
|
||||
|
||||
static const unsigned int sn_objs[NUM_SN]={
|
||||
@@ -2672,6 +2674,7 @@ static const unsigned int sn_objs[NUM_SN]={
|
||||
107, /* "description" */
|
||||
871, /* "destinationIndicator" */
|
||||
28, /* "dhKeyAgreement" */
|
||||
919, /* "dhpublicnumber" */
|
||||
382, /* "directory" */
|
||||
887, /* "distinguishedName" */
|
||||
892, /* "dmdName" */
|
||||
@@ -3455,6 +3458,7 @@ static const unsigned int ln_objs[NUM_LN]={
|
||||
85, /* "X509v3 Subject Alternative Name" */
|
||||
769, /* "X509v3 Subject Directory Attributes" */
|
||||
82, /* "X509v3 Subject Key Identifier" */
|
||||
919, /* "X9.42 DH" */
|
||||
184, /* "X9.57" */
|
||||
185, /* "X9.57 CM ?" */
|
||||
478, /* "aRecord" */
|
||||
@@ -4611,6 +4615,7 @@ static const unsigned int obj_objs[NUM_OBJ]={
|
||||
416, /* OBJ_ecdsa_with_SHA1 1 2 840 10045 4 1 */
|
||||
791, /* OBJ_ecdsa_with_Recommended 1 2 840 10045 4 2 */
|
||||
792, /* OBJ_ecdsa_with_Specified 1 2 840 10045 4 3 */
|
||||
919, /* OBJ_dhpublicnumber 1 2 840 10046 2 1 */
|
||||
258, /* OBJ_id_pkix_mod 1 3 6 1 5 5 7 0 */
|
||||
175, /* OBJ_id_pe 1 3 6 1 5 5 7 1 */
|
||||
259, /* OBJ_id_qt 1 3 6 1 5 5 7 2 */
|
||||
|
Reference in New Issue
Block a user