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

Merge pull request #638 from mesalock-linux/bincat-tls_sms4_gcm

Browse Source 
Add ECDHE-SM2-WITH-SMS4-GCM-SM3
This commit is contained in:
Zhi Guan
2018-12-12 11:26:27 +08:00
committed by GitHub
parent 1c00e47681 ece7d87413
commit 4a8f432f71
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crypto/evp/e_sms4_gcm.c
View File

@@ -440,7 +440,7 @@ static int sms4_gcm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
#define SMS4_GCM_FLAGS (EVP_CIPH_FLAG_DEFAULT_ASN1 \ #define SMS4_GCM_FLAGS (EVP_CIPH_FLAG_DEFAULT_ASN1 \
| EVP_CIPH_CUSTOM_IV | EVP_CIPH_FLAG_CUSTOM_CIPHER \ | EVP_CIPH_CUSTOM_IV | EVP_CIPH_FLAG_CUSTOM_CIPHER \
| EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_CTRL_INIT \ | EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_CTRL_INIT \
| EVP_CIPH_CUSTOM_COPY \ | EVP_CIPH_CUSTOM_COPY | EVP_CIPH_GCM_MODE \
| EVP_CIPH_FLAG_AEAD_CIPHER) | EVP_CIPH_FLAG_AEAD_CIPHER)
static const EVP_CIPHER sms4_gcm = { static const EVP_CIPHER sms4_gcm = {

15
ssl/s3_lib.c
View File

@@ -367,6 +367,21 @@ static SSL_CIPHER ssl3_ciphers[] = {
128, 128,
128, 128,
}, },
{
1,
GMTLS_TXT_ECDHE_SM2_WITH_SMS4_GCM_SM3,
GMTLS_CK_ECDHE_SM2_WITH_SMS4_GCM_SM3,
SSL_kECDHE,
SSL_aSM2,
SSL_SMS4GCM,
SSL_AEAD,
TLS1_2_VERSION, TLS1_2_VERSION,
DTLS1_BAD_VER, DTLS1_2_VERSION,
SSL_HIGH,
SSL_HANDSHAKE_MAC_SM3 | TLS1_PRF_SM3,
128,
128,
},
{ {
1, 1,
GMTLS_TXT_ECDHE_SM2_WITH_SSF33_SM3, GMTLS_TXT_ECDHE_SM2_WITH_SSF33_SM3,