diff options
| author | Jack Lloyd <jack.lloyd@ribose.com> | 2018-01-24 11:56:02 -0500 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2018-03-19 14:33:25 +0100 |
| commit | 3d328a445c2ad0eff2e9e843c384711be58a7c2f (patch) | |
| tree | 888d7dee8ebe744a5fd6a62a6b12c7b6b72bee83 /crypto/objects/objects.txt | |
| parent | df3a15512bd0f5ddd9f0dd74f0a058ee55b33904 (diff) | |
Add SM2 signature and ECIES schemes
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4793)
Diffstat (limited to 'crypto/objects/objects.txt')
| -rw-r--r-- | crypto/objects/objects.txt | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt index 2a9112967f..e565864a48 100644 --- a/crypto/objects/objects.txt +++ b/crypto/objects/objects.txt @@ -36,6 +36,10 @@ member-body 840 : ISO-US : ISO US Member Body ISO-US 10040 : X9-57 : X9.57 X9-57 4 : X9cm : X9.57 CM ? +member-body 156 : ISO-CN : ISO CN Member Body +ISO-CN 10197 : oscca +oscca 1 : sm-scheme + !Cname dsa X9cm 1 : DSA : dsaEncryption X9cm 3 : DSA-SHA1 : dsaWithSHA1 @@ -376,8 +380,10 @@ rsadsi 2 5 : MD5 : md5 rsadsi 2 6 : : hmacWithMD5 rsadsi 2 7 : : hmacWithSHA1 -member-body 156 10197 1 401 : SM3 : sm3 -member-body 156 10197 1 504 : RSA-SM3 : sm3WithRSAEncryption +sm-scheme 301 : SM2 : sm2 + +sm-scheme 401 : SM3 : sm3 +sm-scheme 504 : RSA-SM3 : sm3WithRSAEncryption # From RFC4231 rsadsi 2 8 : : hmacWithSHA224 @@ -1476,10 +1482,6 @@ kisa 1 6 : SEED-OFB : seed-ofb # Definitions for SM4 cipher -member-body 156 : ISO-CN : ISO CN Member Body -ISO-CN 10197 : oscca -oscca 1 : sm-scheme - sm-scheme 104 1 : SM4-ECB : sm4-ecb sm-scheme 104 2 : SM4-CBC : sm4-cbc !Cname sm4-ofb128 |