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

Add SM4/SM3 PSK ciphersuite

Browse Source
This commit is contained in:
Zhi Guan
2019-07-18 16:02:54 +08:00
parent f6429e7579
commit fa68930083
4 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/openssl/gmtls.h
View File

@@ -120,6 +120,8 @@ extern "C" {
# define GMTLS_CK_SM2_PSK_WITH_SMS4_GCM_SM3 0x0300F10C
# define GMTLS_CK_SM2_PSK_WITH_SMS4_CCM_SM3 0x0300F10D
# define GMTLS_CK_ECDHE_PSK_WITH_SMS4_CBC_SM3 0x0300F10E
# define GMTLS_CK_PSK_WITH_SM1_CBC_SM3 0x0300F10E
# define GMTLS_CK_PSK_WITH_SM1_GCM_SM3 0x0300F10F /* reserved */
# define GMTLS_CK_PSK_WITH_SM1_CCM_SM3 0x0300F110 /* reserved */
@@ -187,6 +189,7 @@ extern "C" {
# define GMTLS_TXT_RSA_PSK_WITH_NULL_SM3 "RSA-PSK-WITH-NULL-SM3"
# define GMTLS_TXT_SM2_PSK_WITH_NULL_SM3 "SM2-PSK_WITH-NULL-SM3"
# define GMTLS_TXT_ECDHE_PSK_WITH_NULL_SM3 "ECDHE-PSK-WITH-NULL-SM3"
# define GMTLS_TXT_ECDHE_PSK_WITH_SMS4_CBC_SM3 "ECDHE-PSK-WITH-SMS4-CBC-SM3"
/* PSK ciphersuits with SMS4 */
# define GMTLS_TXT_PSK_WITH_SMS4_CBC_SM3 "PSK-WITH-SMS4-CBC-SM3"

4
include/openssl/opensslv.h
View File

@@ -41,9 +41,9 @@ extern "C" {
*/
# define OPENSSL_VERSION_NUMBER 0x1010004fL
# ifdef OPENSSL_FIPS
# define OPENSSL_VERSION_TEXT "GmSSL 2.5.1 - OpenSSL 1.1.0d-fips 13 Jun 2019"
# define OPENSSL_VERSION_TEXT "GmSSL 2.5.2 - OpenSSL 1.1.0d-fips 18 July 2019"
# else
# define OPENSSL_VERSION_TEXT "GmSSL 2.5.1 - OpenSSL 1.1.0d 13 Jun 2019"
# define OPENSSL_VERSION_TEXT "GmSSL 2.5.2 - OpenSSL 1.1.0d 18 July 2019"
# endif
/*-

17
ssl/s3_lib.c
View File

@@ -2026,6 +2026,23 @@ static SSL_CIPHER ssl3_ciphers[] = {
256,
256,
},
#ifndef OPENSSL_NO_GMTLS
{
1,
GMTLS_TXT_ECDHE_PSK_WITH_SMS4_CBC_SM3,
GMTLS_CK_ECDHE_PSK_WITH_SMS4_CBC_SM3,
SSL_kECDHEPSK,
SSL_aPSK,
SSL_SMS4,
SSL_SM3,
TLS1_VERSION, TLS1_2_VERSION,
DTLS1_BAD_VER, DTLS1_2_VERSION,
SSL_HIGH,
SSL_HANDSHAKE_MAC_SM3 | TLS1_PRF,
128,
128,
},
#endif
{
1,
TLS1_TXT_ECDHE_PSK_WITH_NULL_SHA,

3
ssl/t1_trce.c
View File

@@ -516,6 +516,9 @@ static ssl_trace_tbl ssl_ciphers_tbl[] = {
{0xFEFE, "SSL_RSA_FIPS_WITH_DES_CBC_SHA"},
{0xFEFF, "SSL_RSA_FIPS_WITH_3DES_EDE_CBC_SHA"},
#ifndef OPENSSL_NO_GMTLS
{0xF10E, "GMTLS_ECDHE_PSK_WITH_SMS4_CBC_SM3"},
#endif
};
/* Compression methods */