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

Merge pull request #970 from Trisia/master

Browse Source 
[bug fix] 修复了ECC_SM4_SM3套件在秘钥交换过程中的错误
This commit is contained in:
Zhi Guan
2020-07-27 11:44:38 +08:00
committed by GitHub
parent d4420f3876 1d495efebb
commit 09e2d791a8
1 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
ssl/statem/statem_gmtls.c
View File

@@ -492,10 +492,11 @@ static int gmtls_construct_ske_sm2dhe(SSL *s, unsigned char **p, int *l, int *al
SSLerr(SSL_F_GMTLS_CONSTRUCT_SKE_SM2DHE, ERR_R_EVP_LIB); SSLerr(SSL_F_GMTLS_CONSTRUCT_SKE_SM2DHE, ERR_R_EVP_LIB);
goto end; goto end;
} }
if (!(id = X509_NAME_oneline(X509_get_subject_name(x509), NULL, 0))) { // if (!(id = X509_NAME_oneline(X509_get_subject_name(x509), NULL, 0))) {
SSLerr(SSL_F_GMTLS_CONSTRUCT_SKE_SM2DHE, ERR_R_EVP_LIB); // SSLerr(SSL_F_GMTLS_CONSTRUCT_SKE_SM2DHE, ERR_R_EVP_LIB);
goto end; // goto end;
} // }
id = SM2_DEFAULT_ID;
zlen = sizeof(z); zlen = sizeof(z);
if (!SM2_compute_id_digest(EVP_sm3(), id, strlen(id), z, &zlen, if (!SM2_compute_id_digest(EVP_sm3(), id, strlen(id), z, &zlen,
EVP_PKEY_get0_EC_KEY(pkey))) { EVP_PKEY_get0_EC_KEY(pkey))) {
@@ -626,11 +627,12 @@ static int gmtls_process_ske_sm2dhe(SSL *s, PACKET *pkt, int *al)
} }
/* prepare sm2 z value */ /* prepare sm2 z value */
if (!(id = X509_NAME_oneline( // if (!(id = X509_NAME_oneline(
X509_get_subject_name(s->session->peer), NULL, 0))) { // X509_get_subject_name(s->session->peer), NULL, 0))) {
SSLerr(SSL_F_GMTLS_PROCESS_SKE_SM2DHE, ERR_R_EVP_LIB); // SSLerr(SSL_F_GMTLS_PROCESS_SKE_SM2DHE, ERR_R_EVP_LIB);
goto end; // goto end;
} // }
id = SM2_DEFAULT_ID;
zlen = sizeof(z); zlen = sizeof(z);
if (!SM2_compute_id_digest(EVP_sm3(), id, strlen(id), z, &zlen, if (!SM2_compute_id_digest(EVP_sm3(), id, strlen(id), z, &zlen,
EVP_PKEY_get0_EC_KEY(pkey))) { EVP_PKEY_get0_EC_KEY(pkey))) {
@@ -696,7 +698,7 @@ static unsigned char *gmtls_new_cert_packet(X509 *x, int *l)
p = ret; p = ret;
l2n3(n, p); l2n3(n, p);
*l = n; *l = n+3;
end: end:
return ret; return ret;
@@ -745,10 +747,11 @@ static int gmtls_construct_ske_sm2(SSL *s, unsigned char **p, int *l, int *al)
SSLerr(SSL_F_GMTLS_CONSTRUCT_SKE_SM2, ERR_R_EVP_LIB); SSLerr(SSL_F_GMTLS_CONSTRUCT_SKE_SM2, ERR_R_EVP_LIB);
goto end; goto end;
} }
if (!(id = X509_NAME_oneline(X509_get_subject_name(x509), NULL, 0))) { // if (!(id = X509_NAME_oneline(X509_get_subject_name(x509), NULL, 0))) {
SSLerr(SSL_F_GMTLS_CONSTRUCT_SKE_SM2, ERR_R_EVP_LIB); // SSLerr(SSL_F_GMTLS_CONSTRUCT_SKE_SM2, ERR_R_EVP_LIB);
goto end; // goto end;
} // }
id = SM2_DEFAULT_ID;
zlen = sizeof(z); zlen = sizeof(z);
if (!SM2_compute_id_digest(EVP_sm3(), id, strlen(id), z, &zlen, if (!SM2_compute_id_digest(EVP_sm3(), id, strlen(id), z, &zlen,
EVP_PKEY_get0_EC_KEY(pkey))) { EVP_PKEY_get0_EC_KEY(pkey))) {
@@ -802,7 +805,7 @@ static int gmtls_construct_ske_sm2(SSL *s, unsigned char **p, int *l, int *al)
end: end:
OPENSSL_free(buf); OPENSSL_free(buf);
EVP_MD_CTX_free(md_ctx); EVP_MD_CTX_free(md_ctx);
OPENSSL_free(id); // OPENSSL_free(id);
return ret; return ret;
} }
@@ -865,10 +868,11 @@ static int gmtls_process_ske_sm2(SSL *s, PACKET *pkt, int *al)
} }
/* prepare sm2 z value */ /* prepare sm2 z value */
if (!(id = X509_NAME_oneline(X509_get_subject_name(x509), NULL, 0))) { // if (!(id = X509_NAME_oneline(X509_get_subject_name(x509), NULL, 0))) {
SSLerr(SSL_F_GMTLS_PROCESS_SKE_SM2, ERR_R_EVP_LIB); // SSLerr(SSL_F_GMTLS_PROCESS_SKE_SM2, ERR_R_EVP_LIB);
goto end; // goto end;
} // }
id = SM2_DEFAULT_ID;
zlen = sizeof(z); zlen = sizeof(z);
if (!SM2_compute_id_digest(EVP_sm3(), id, strlen(id), z, &zlen, if (!SM2_compute_id_digest(EVP_sm3(), id, strlen(id), z, &zlen,
EVP_PKEY_get0_EC_KEY(pkey))) { EVP_PKEY_get0_EC_KEY(pkey))) {
@@ -903,7 +907,7 @@ static int gmtls_process_ske_sm2(SSL *s, PACKET *pkt, int *al)
end: end:
OPENSSL_free(buf); OPENSSL_free(buf);
EVP_MD_CTX_free(md_ctx); EVP_MD_CTX_free(md_ctx);
OPENSSL_free(id); // OPENSSL_free(id);
return ret; return ret;
} }