From 1d495efebbdfcb557b9cdca20ed85a9aaf984549 Mon Sep 17 00:00:00 2001 From: cliven Date: Thu, 4 Jun 2020 15:55:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=8EBUG=E7=9A=84=E5=8F=91=E7=94=9F?= =?UTF-8?q?=E5=A4=84=E4=BF=AE=E6=94=B9=E4=BA=86=E8=AF=81=E4=B9=A6=E9=95=BF?= =?UTF-8?q?=E5=BA=A6=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ssl/statem/statem_gmtls.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/ssl/statem/statem_gmtls.c b/ssl/statem/statem_gmtls.c index b9944eb9..ee853457 100644 --- a/ssl/statem/statem_gmtls.c +++ b/ssl/statem/statem_gmtls.c @@ -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); goto end; } - if (!(id = X509_NAME_oneline(X509_get_subject_name(x509), NULL, 0))) { - SSLerr(SSL_F_GMTLS_CONSTRUCT_SKE_SM2DHE, ERR_R_EVP_LIB); - goto end; - } +// if (!(id = X509_NAME_oneline(X509_get_subject_name(x509), NULL, 0))) { +// SSLerr(SSL_F_GMTLS_CONSTRUCT_SKE_SM2DHE, ERR_R_EVP_LIB); +// goto end; +// } + id = SM2_DEFAULT_ID; zlen = sizeof(z); if (!SM2_compute_id_digest(EVP_sm3(), id, strlen(id), z, &zlen, 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 */ - if (!(id = X509_NAME_oneline( - X509_get_subject_name(s->session->peer), NULL, 0))) { - SSLerr(SSL_F_GMTLS_PROCESS_SKE_SM2DHE, ERR_R_EVP_LIB); - goto end; - } +// if (!(id = X509_NAME_oneline( +// X509_get_subject_name(s->session->peer), NULL, 0))) { +// SSLerr(SSL_F_GMTLS_PROCESS_SKE_SM2DHE, ERR_R_EVP_LIB); +// goto end; +// } + id = SM2_DEFAULT_ID; zlen = sizeof(z); if (!SM2_compute_id_digest(EVP_sm3(), id, strlen(id), z, &zlen, EVP_PKEY_get0_EC_KEY(pkey))) { @@ -696,7 +698,7 @@ static unsigned char *gmtls_new_cert_packet(X509 *x, int *l) p = ret; l2n3(n, p); - *l = n; + *l = n+3; end: return ret; @@ -777,7 +779,7 @@ static int gmtls_construct_ske_sm2(SSL *s, unsigned char **p, int *l, int *al) SSL3_RANDOM_SIZE) <= 0 || EVP_SignUpdate(md_ctx, &(s->s3->server_random[0]), SSL3_RANDOM_SIZE) <= 0 - || EVP_SignUpdate(md_ctx, buf, n+3) <= 0) { + || EVP_SignUpdate(md_ctx, buf, n) <= 0) { SSLerr(SSL_F_GMTLS_CONSTRUCT_SKE_SM2, ERR_R_EVP_LIB); goto end; } @@ -887,7 +889,7 @@ static int gmtls_process_ske_sm2(SSL *s, PACKET *pkt, int *al) SSL3_RANDOM_SIZE) <= 0 || EVP_VerifyUpdate(md_ctx, &(s->s3->server_random[0]), SSL3_RANDOM_SIZE) <= 0 - || EVP_VerifyUpdate(md_ctx, buf, n+3) <= 0) { + || EVP_VerifyUpdate(md_ctx, buf, n) <= 0) { SSLerr(SSL_F_GMTLS_PROCESS_SKE_SM2, ERR_R_EVP_LIB); goto end; }