abc/GmSSL
1
0
Fork 0
mirror of https://github.com/guanzhi/GmSSL.git synced 2026-08-07 21:53:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update SM9 decrypt

Browse Source 
to be tested
This commit is contained in:
Zhi Guan
2018-10-06 17:33:34 +08:00
parent f07ca5eeff
commit 9ca519edfa
2 changed files with 85 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
crypto/sm9/sm9_enc.c
View File

@@ -53,6 +53,7 @@
#include <openssl/sm2.h> #include <openssl/sm2.h>
#include <openssl/sm9.h> #include <openssl/sm9.h>
#include <openssl/hmac.h> #include <openssl/hmac.h>
#include <openssl/crypto.h>
#include "sm9_lcl.h" #include "sm9_lcl.h"
/* /*
@@ -392,7 +393,10 @@ int SM9_encrypt(int type,
} }
/* C3 = MAC(K2, C2) */ /* C3 = MAC(K2, C2) */
HMAC(md, key + inlen, EVP_MD_size(md), key, inlen, mac, &maclen); if (!HMAC(md, key + inlen, EVP_MD_size(md), key, inlen, mac, &maclen)) {
SM9err(SM9_F_SM9_ENCRYPT, ERR_R_EVP_LIB);
goto end;
}
/* compose SM9Ciphertext */ /* compose SM9Ciphertext */
if (!ASN1_STRING_set(sm9cipher->pointC1, C1, C1_len) if (!ASN1_STRING_set(sm9cipher->pointC1, C1, C1_len)
@@ -422,5 +426,84 @@ int SM9_decrypt(int type,
unsigned char *out, size_t *outlen, unsigned char *out, size_t *outlen,
SM9PrivateKey *sk) SM9PrivateKey *sk)
{ {
int ret = 0;
SM9Ciphertext *sm9cipher = NULL;
unsigned char *key = NULL;
size_t keylen;
int kdf;
const EVP_MD *md;
const unsigned char *C2;
int C2_len;
unsigned char mac[EVP_MAX_MD_SIZE];
unsigned int maclen = sizeof(mac);
int len, i;
/* parse type */
switch (type) {
case NID_sm9encrypt_with_sm3_xor:
kdf = NID_sm9kdf_with_sm3;
md = EVP_sm3();
break;
/*
case NID_sm9encrypt_with_sha256_xor:
kdf = NID_sm9kdf_with_sha256;
md = EVP_sha256();
break;
*/
case NID_sm9encrypt_with_sm3_sms4_cbc:
case NID_sm9encrypt_with_sm3_sms4_ctr:
default:
return 0; return 0;
} }
/* decode sm9 ciphertext */
if (!(sm9cipher = d2i_SM9Ciphertext(NULL, &in, inlen))) {
SM9err(SM9_F_SM9_DECRYPT, ERR_R_SM9_LIB);
goto end;
}
C2 = ASN1_STRING_get0_data(sm9cipher->c2);
C2_len = ASN1_STRING_length(sm9cipher->c2);
/* check mac length */
if (ASN1_STRING_length(sm9cipher->c3) != EVP_MD_size(md)) {
SM9err(SM9_F_SM9_DECRYPT, ERR_R_SM9_LIB);
goto end;
}
/* unwrap key */
keylen = C2_len + EVP_MD_size(md);
if (!(key = OPENSSL_malloc(keylen))) {
SM9err(SM9_F_SM9_DECRYPT, ERR_R_MALLOC_FAILURE);
goto end;
}
if (!SM9_unwrap_key(kdf, key, keylen,
ASN1_STRING_get0_data(sm9cipher->pointC1),
ASN1_STRING_length(sm9cipher->pointC1), sk)) {
SM9err(SM9_F_SM9_DECRYPT, ERR_R_SM9_LIB);
goto end;
}
/* M = C2 xor key */
for (i = 0; i < C2_len; i++) {
out[i] = C2[i] ^ key[i];
}
*outlen = C2_len;
/* check C3 == MAC(K2, C2) */
if (!HMAC(md, key + C2_len, EVP_MD_size(md), key, C2_len, mac, &maclen)) {
SM9err(SM9_F_SM9_DECRYPT, ERR_R_EVP_LIB);
goto end;
}
if (CRYPTO_memcmp(ASN1_STRING_get0_data(sm9cipher->c3), mac, maclen) != 0) {
SM9err(SM9_F_SM9_DECRYPT, ERR_R_EVP_LIB);
goto end;
}
ret = 1;
end:
SM9Ciphertext_free(sm9cipher);
OPENSSL_clear_free(key, keylen);
return ret;
}

14
ssl/statem/statem_gmtls.c
View File

@@ -1772,7 +1772,6 @@ static int gmtls_construct_cke_sm9(SSL *s, unsigned char **p, int *l, int *al)
{ {
int ret = 0; int ret = 0;
CERT_SM9 *sm9; CERT_SM9 *sm9;
SM9EncParameters encparam;
unsigned char *pms = NULL; unsigned char *pms = NULL;
size_t pmslen; size_t pmslen;
size_t enclen; size_t enclen;
@@ -1799,12 +1798,6 @@ static int gmtls_construct_cke_sm9(SSL *s, unsigned char **p, int *l, int *al)
goto end; goto end;
} }
encparam.kdf_md = EVP_sm3();
encparam.enc_cipher = EVP_get_cipherbynid(
SSL_CIPHER_get_cipher_nid(s->s3->tmp.new_cipher));
encparam.cmac_cipher = NULL;
encparam.cbcmac_cipher = NULL;
encparam.hmac_md = EVP_sm3();
#if 0 #if 0
if (!SM9_encrypt(sm9->params, &encparam, pms, pmslen, if (!SM9_encrypt(sm9->params, &encparam, pms, pmslen,
@@ -1842,7 +1835,6 @@ static int gmtls_process_cke_sm9(SSL *s, PACKET *pkt, int *al)
int ret = 0; int ret = 0;
PACKET enced_pms; PACKET enced_pms;
CERT_SM9 *sm9; CERT_SM9 *sm9;
SM9EncParameters encparam;
unsigned char *pms = NULL; unsigned char *pms = NULL;
size_t pms_len; size_t pms_len;
@@ -1862,12 +1854,6 @@ static int gmtls_process_cke_sm9(SSL *s, PACKET *pkt, int *al)
return 0; return 0;
} }
encparam.kdf_md = EVP_sm3();
encparam.enc_cipher = EVP_get_cipherbynid(
SSL_CIPHER_get_cipher_nid(s->s3->tmp.new_cipher));
encparam.cmac_cipher = NULL;
encparam.cbcmac_cipher = NULL;
encparam.hmac_md = EVP_sm3();
#if 0 #if 0
if (!SM9_decrypt(sm9->params, &encparam, if (!SM9_decrypt(sm9->params, &encparam,