abc/GmSSL
1
0
Fork 0
mirror of https://github.com/guanzhi/GmSSL.git synced 2026-05-24 09:16:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add SM9 encapsulate key functions

Browse Source
This commit is contained in:
Zhi Guan
2018-10-05 11:53:13 +08:00
parent eaf4002536
commit a7b96e8024
12 changed files with 5754 additions and 5362 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/openssl/obj_mac.h
View File

@@ -5032,6 +5032,10 @@
#define NID_sm9hash1 1201
#define OBJ_sm9hash1 OBJ_sm_scheme,302L,4L
#define SN_sm9kdf "sm9kdf"
#define NID_sm9kdf 1209
#define OBJ_sm9kdf OBJ_sm_scheme,302L,5L
#define SN_sm9hash1_with_sm3 "sm9hash1-with-sm3"
#define NID_sm9hash1_with_sm3 1202
#define OBJ_sm9hash1_with_sm3 OBJ_sm9hash1,1L
@@ -5040,6 +5044,14 @@
#define NID_sm9hash1_with_sha256 1203
#define OBJ_sm9hash1_with_sha256 OBJ_sm9hash1,2L
#define SN_sm9kdf_with_sm3 "sm9kdf-with-sm3"
#define NID_sm9kdf_with_sm3 1210
#define OBJ_sm9kdf_with_sm3 OBJ_sm9kdf,1L
#define SN_sm9kdf_with_sha256 "sm9kdf-with-sha256"
#define NID_sm9kdf_with_sha256 1211
#define OBJ_sm9kdf_with_sha256 OBJ_sm9kdf,2L
#define SN_sm3 "SM3"
#define LN_sm3 "sm3"
#define NID_sm3 1126

4
include/openssl/opensslv.h
View File

@@ -41,9 +41,9 @@ extern "C" {
*/
# define OPENSSL_VERSION_NUMBER 0x1010004fL
# ifdef OPENSSL_FIPS
# define OPENSSL_VERSION_TEXT "GmSSL 2.3.3 - OpenSSL 1.1.0d-fips 29 Sep 2018"
# define OPENSSL_VERSION_TEXT "GmSSL 2.3.4 - OpenSSL 1.1.0d-fips 5 Oct 2018"
# else
# define OPENSSL_VERSION_TEXT "GmSSL 2.3.3 - OpenSSL 1.1.0d 29 Sep 2018"
# define OPENSSL_VERSION_TEXT "GmSSL 2.3.4 - OpenSSL 1.1.0d 5 Oct 2018"
# endif
/*-

16
include/openssl/sm9.h
View File

@@ -126,6 +126,19 @@ int SM9_VerifyInit(EVP_MD_CTX *ctx, const EVP_MD *md, ENGINE *engine);
#define SM9_VerifyUpdate(ctx,d,l) EVP_DigestUpdate(ctx,d,l)
int SM9_VerifyFinal(EVP_MD_CTX *ctx, const SM9Signature *sig, SM9PublicKey *pk);
int SM9_wrap_key(int type, /* NID_sm9kdf_with_sm3 */
unsigned char *key, size_t keylen,
unsigned char *enced_key, size_t *enced_len,
SM9PublicParameters *mpk, const char *id, size_t idlen);
int SM9_unwrap_key(int type,
unsigned char *key, size_t keylen,
const unsigned char *enced_key, size_t enced_len,
SM9PrivateKey *sk);
typedef struct {
const EVP_MD *kdf_md;
const EVP_CIPHER *enc_cipher;
@@ -202,12 +215,14 @@ int ERR_load_SM9_strings(void);
# define SM9_R_GENERATE_MAC_FAILURE 102
# define SM9_R_HASH_FAILURE 103
# define SM9_R_INVALID_CIPHERTEXT 104
# define SM9_R_INVALID_DIGEST_TYPE 130
# define SM9_R_INVALID_ENCPARAMETERS 105
# define SM9_R_INVALID_HASH1 106
# define SM9_R_INVALID_HASH2_DIGEST 126
# define SM9_R_INVALID_ID 107
# define SM9_R_INVALID_ID_LENGTH 108
# define SM9_R_INVALID_INPUT 109
# define SM9_R_INVALID_KEM_KEY_LENGTH 128
# define SM9_R_INVALID_KEY_LENGTH 110
# define SM9_R_INVALID_MD 111
# define SM9_R_INVALID_PAIRING_TYPE 112
@@ -220,6 +235,7 @@ int ERR_load_SM9_strings(void);
# define SM9_R_INVALID_TYPE1CURVE 115
# define SM9_R_KDF_FAILURE 116
# define SM9_R_PAIRING_ERROR 124
# define SM9_R_RATE_PAIRING_ERROR 129
# define SM9_R_TWIST_CURVE_ERROR 117
# define SM9_R_VERIFY_FAILURE 125
# define SM9_R_ZERO_ID 118