From ece7d8741386ef5378dcd91067d32eb2bea045a1 Mon Sep 17 00:00:00 2001
From: Yiming Jing <jingyiming@baidu.com>
Date: Tue, 11 Dec 2018 18:51:32 -0800
Subject: [PATCH] Add ECDHE-SM2-WITH-SMS4-GCM-SM3

---
 crypto/evp/e_sms4_gcm.c |  2 +-
 ssl/s3_lib.c            | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/crypto/evp/e_sms4_gcm.c b/crypto/evp/e_sms4_gcm.c
index a3bd41aa..130193a2 100644
--- a/crypto/evp/e_sms4_gcm.c
+++ b/crypto/evp/e_sms4_gcm.c
@@ -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 = {
diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index 0495678b..4b960ac6 100644
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -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,