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

bug fix

Browse Source
This commit is contained in:
Zhi Guan
2017-12-08 21:29:23 +08:00
parent e586232c5b
commit 2c2739c9e2
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Configure
View File

@@ -483,7 +483,7 @@ our %disabled = ( # "what" => "comment"
"skfeng" => "default", "skfeng" => "default",
"sdfeng" => "default", "sdfeng" => "default",
"gmieng" => "default", "gmieng" => "default",
"gmtls" => "default", #"gmtls" => "default",
); );
# Note: => pair form used for aesthetics, not to truly make a hash table # Note: => pair form used for aesthetics, not to truly make a hash table

2
ssl/ssl_lib.c
View File

@@ -2898,7 +2898,7 @@ CERT_PKEY *ssl_get_server_send_pkey_ex(SSL *s)
if (i < 0) if (i < 0)
return NULL; return NULL;
if (i == SSL_PKEY_SM2_SIGN) { if (i == SSL_PKEY_SM2) {
i = SSL_PKEY_SM2_ENC; i = SSL_PKEY_SM2_ENC;
} }

4
ssl/statem/statem_srvr.c
View File

@@ -690,14 +690,14 @@ int ossl_statem_server_construct_message(SSL *s)
case TLS_ST_SW_CERT: case TLS_ST_SW_CERT:
#ifndef OPENSSL_NO_GMTLS #ifndef OPENSSL_NO_GMTLS
if (SSL_IS_GMTLS(s)) if (SSL_IS_GMTLS(s))
return tls_construct_server_certificate(s) return tls_construct_server_certificate(s);
#endif #endif
return tls_construct_server_certificate(s); return tls_construct_server_certificate(s);
case TLS_ST_SW_KEY_EXCH: case TLS_ST_SW_KEY_EXCH:
#ifndef OPENSSL_NO_GMTLS #ifndef OPENSSL_NO_GMTLS
if (SSL_IS_GMTLS(s)) if (SSL_IS_GMTLS(s))
return gmtls_construct_server_key_exchange(s) return gmtls_construct_server_key_exchange(s);
#endif #endif
return tls_construct_server_key_exchange(s); return tls_construct_server_key_exchange(s);