Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add ECDHE-SM2-WITH-SMS4-GCM-SM3 #638

Merged
merged 1 commit into from Dec 12, 2018
Merged

Add ECDHE-SM2-WITH-SMS4-GCM-SM3 #638

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion crypto/evp/e_sms4_gcm.c
View file
Open in desktop
Expand Up @@ -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 \
| EVP_CIPH_CUSTOM_IV | EVP_CIPH_FLAG_CUSTOM_CIPHER \
| 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)

static const EVP_CIPHER sms4_gcm = {
Expand Down
15 changes: 15 additions & 0 deletions ssl/s3_lib.c
View file
Open in desktop
Expand Up @@ -367,6 +367,21 @@ static SSL_CIPHER ssl3_ciphers[] = {
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,
GMTLS_TXT_ECDHE_SM2_WITH_SSF33_SM3,
Expand Down