This commit is contained in:
Zhi Guan
2016-06-06 22:04:44 +02:00
parent 2bf25bd29f
commit 2cb43b7f80
142 changed files with 7768 additions and 1678 deletions

View File

@@ -56,6 +56,13 @@ static const nid_triple sigoid_srt[] = {
NID_dh_cofactor_kdf},
{NID_dhSinglePass_cofactorDH_sha512kdf_scheme, NID_sha512,
NID_dh_cofactor_kdf},
{NID_sm2sign_with_sm3, NID_sm3, NID_X9_62_id_ecPublicKey},
{NID_sm2sign_with_sha1, NID_sha1, NID_sm2sign},
{NID_sm2sign_with_sha256, NID_sha256, NID_sm2sign},
{NID_sm2sign_with_sha512, NID_sha512, NID_sm2sign},
{NID_sm2sign_with_sha224, NID_sha224, NID_sm2sign},
{NID_sm2sign_with_sha384, NID_sha384, NID_sm2sign},
{NID_sm2sign_with_rmd160, NID_ripemd160, NID_sm2sign},
};
static const nid_triple *const sigoid_srt_xref[] = {
@@ -71,29 +78,36 @@ static const nid_triple *const sigoid_srt_xref[] = {
&sigoid_srt[12],
&sigoid_srt[30],
&sigoid_srt[35],
&sigoid_srt[41],
&sigoid_srt[6],
&sigoid_srt[10],
&sigoid_srt[46],
&sigoid_srt[11],
&sigoid_srt[13],
&sigoid_srt[24],
&sigoid_srt[20],
&sigoid_srt[32],
&sigoid_srt[37],
&sigoid_srt[42],
&sigoid_srt[14],
&sigoid_srt[21],
&sigoid_srt[33],
&sigoid_srt[38],
&sigoid_srt[45],
&sigoid_srt[15],
&sigoid_srt[22],
&sigoid_srt[34],
&sigoid_srt[39],
&sigoid_srt[43],
&sigoid_srt[16],
&sigoid_srt[23],
&sigoid_srt[19],
&sigoid_srt[31],
&sigoid_srt[36],
&sigoid_srt[44],
&sigoid_srt[25],
&sigoid_srt[26],
&sigoid_srt[27],
&sigoid_srt[28],
&sigoid_srt[40],
};

View File

@@ -29,6 +29,7 @@ dsaWithSHA1 sha1 dsa
dsaWithSHA1_2 sha1 dsa_2
# GMSSL: here is the problem!
ecdsa_with_SHA1 sha1 X9_62_id_ecPublicKey
ecdsa_with_SHA224 sha224 X9_62_id_ecPublicKey
ecdsa_with_SHA256 sha256 X9_62_id_ecPublicKey
@@ -36,6 +37,7 @@ ecdsa_with_SHA384 sha384 X9_62_id_ecPublicKey
ecdsa_with_SHA512 sha512 X9_62_id_ecPublicKey
ecdsa_with_Recommended undef X9_62_id_ecPublicKey
ecdsa_with_Specified undef X9_62_id_ecPublicKey
sm2sign_with_sm3 sm3 X9_62_id_ecPublicKey
dsa_with_SHA224 sha224 dsa
dsa_with_SHA256 sha256 dsa
@@ -56,3 +58,11 @@ dhSinglePass_cofactorDH_sha224kdf_scheme sha224 dh_cofactor_kdf
dhSinglePass_cofactorDH_sha256kdf_scheme sha256 dh_cofactor_kdf
dhSinglePass_cofactorDH_sha384kdf_scheme sha384 dh_cofactor_kdf
dhSinglePass_cofactorDH_sha512kdf_scheme sha512 dh_cofactor_kdf
# GMSSL SM2 schemes
sm2sign_with_sha1 sha1 sm2sign
sm2sign_with_sha256 sha256 sm2sign
sm2sign_with_sha512 sha512 sm2sign
sm2sign_with_sha224 sha224 sm2sign
sm2sign_with_sha384 sha384 sm2sign
sm2sign_with_rmd160 ripemd160 sm2sign