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

some bug fix

Browse Source
This commit is contained in:
Zhi Guan
2018-12-06 22:12:05 +08:00
parent bc2bb8a335
commit 9b5eaab86a
19 changed files with 184 additions and 5640 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
crypto/sm2/sm2_asn1.c
View File

@@ -67,9 +67,10 @@ ASN1_SEQUENCE(SM2CiphertextValue) = {
IMPLEMENT_ASN1_FUNCTIONS(SM2CiphertextValue)
IMPLEMENT_ASN1_DUP_FUNCTION(SM2CiphertextValue)
int SM2CiphertextValue_size(const EC_GROUP *group, size_t inlen)
int SM2_ciphertext_size(const EC_KEY *ec_key, size_t inlen)
{
int ret;
const EC_GROUP *group = NULL;
ASN1_OCTET_STRING s;
int len = 0, i;
@@ -78,6 +79,10 @@ int SM2CiphertextValue_size(const EC_GROUP *group, size_t inlen)
return 0;
}
if (ec_key) {
group = EC_KEY_get0_group(ec_key);
}
if (group) {
ASN1_INTEGER a;
unsigned char buf[4] = {0xff};

35
crypto/sm2/sm2_enc.c
View File

@@ -84,7 +84,7 @@ SM2CiphertextValue *SM2_do_encrypt(const EVP_MD *md,
return 0;
}
if (inlen < SM2_MIN_PLAINTEXT_LENGTH || inlen > SM2_MAX_PLAINTEXT_LENGTH) {
if (inlen <= 0 || inlen > SM2_MAX_PLAINTEXT_LENGTH) {
SM2err(SM2_F_SM2_DO_ENCRYPT, SM2_R_INVALID_PLAINTEXT_LENGTH);
return 0;
}
@@ -230,24 +230,47 @@ end:
int SM2_encrypt(int type, const unsigned char *in, size_t inlen,
unsigned char *out, size_t *outlen, EC_KEY *ec_key)
{
int ret = 0;
const EVP_MD *md;
SM2CiphertextValue *cv;
SM2CiphertextValue *cv = NULL;
int clen;
// check type
if (!(md = EVP_get_digestbynid(type))) {
SM2err(SM2_F_SM2_ENCRYPT, SM2_R_INVALID_DIGEST_ALGOR);
*outlen = 0;
return 0;
}
if (!(clen = SM2_ciphertext_size(ec_key, inlen))) {
SM2err(SM2_F_SM2_ENCRYPT, ERR_R_SM2_LIB);
return 0;
}
if (!out) {
*outlen = clen;
return 1;
} else if (*outlen < clen) {
SM2err(SM2_F_SM2_ENCRYPT, SM2_R_BUFFER_TOO_SMALL);
return 0;
}
RAND_seed(in, inlen);
if (!(cv = SM2_do_encrypt(md, in, inlen, ec_key))) {
SM2err(SM2_F_SM2_ENCRYPT, ERR_R_SM2_LIB);
*outlen = 0;
return 0;
}
*outlen = i2d_SM2CiphertextValue(cv, &out);
if ((clen = i2d_SM2CiphertextValue(cv, &out)) <= 0) {
SM2err(SM2_F_SM2_ENCRYPT, ERR_R_SM2_LIB);
goto end;
}
*outlen = clen;
ret = 1;
end:
SM2CiphertextValue_free(cv);
return 1;
return ret;
}
int SM2_decrypt(int type, const unsigned char *in, size_t inlen,
@@ -353,7 +376,7 @@ int SM2_do_decrypt(const EVP_MD *md, const SM2CiphertextValue *cv,
return 0;
}
if (cv->ciphertext->length < SM2_MIN_PLAINTEXT_LENGTH
if (cv->ciphertext->length <= 0
|| cv->ciphertext->length > SM2_MAX_PLAINTEXT_LENGTH) {
SM2err(SM2_F_SM2_DO_DECRYPT, SM2_R_INVALID_CIPHERTEXT);
return 0;

6
crypto/sm2/sm2_lcl.h
View File

@@ -52,6 +52,10 @@
#define SM2_MAX_PKEY_DATA_LENGTH ((EC_MAX_NBYTES + 1) * 6)
#define SM2_MAX_PLAINTEXT_LENGTH 65535
#define SM2_MAX_CIPHERTEXT_LENGTH (SM2_MAX_PLAINTEXT_LENGTH + 2048)
int SM2_get_public_key_data(EC_KEY *ec_key, unsigned char *out, size_t *outlen);
struct SM2CiphertextValue_st {
@@ -92,5 +96,5 @@ struct sm2_kap_ctx_st {
};
int SM2_ciphertext_size(const EC_KEY *ec_key, size_t inlen);