Skip to content

Commit 1d495ef

Browse files
TrisiaTrisia
committed
从BUG的发生处修改了证书长度问题
1 parent 83c5ff2 commit 1d495ef

1 file changed

Lines changed: 14 additions & 12 deletions

File tree

‎ssl/statem/statem_gmtls.c‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -492,10 +492,11 @@ static int gmtls_construct_ske_sm2dhe(SSL *s, unsigned char **p, int *l, int *al
492492
SSLerr(SSL_F_GMTLS_CONSTRUCT_SKE_SM2DHE, ERR_R_EVP_LIB);
493493
goto end;
494494
}
495-
if (!(id = X509_NAME_oneline(X509_get_subject_name(x509), NULL, 0))) {
496-
SSLerr(SSL_F_GMTLS_CONSTRUCT_SKE_SM2DHE, ERR_R_EVP_LIB);
497-
goto end;
498-
}
495+
// if (!(id = X509_NAME_oneline(X509_get_subject_name(x509), NULL, 0))) {
496+
// SSLerr(SSL_F_GMTLS_CONSTRUCT_SKE_SM2DHE, ERR_R_EVP_LIB);
497+
// goto end;
498+
// }
499+
id = SM2_DEFAULT_ID;
499500
zlen = sizeof(z);
500501
if (!SM2_compute_id_digest(EVP_sm3(), id, strlen(id), z, &zlen,
501502
EVP_PKEY_get0_EC_KEY(pkey))) {
@@ -626,11 +627,12 @@ static int gmtls_process_ske_sm2dhe(SSL *s, PACKET *pkt, int *al)
626627
}
627628

628629
/* prepare sm2 z value */
629-
if (!(id = X509_NAME_oneline(
630-
X509_get_subject_name(s->session->peer), NULL, 0))) {
631-
SSLerr(SSL_F_GMTLS_PROCESS_SKE_SM2DHE, ERR_R_EVP_LIB);
632-
goto end;
633-
}
630+
// if (!(id = X509_NAME_oneline(
631+
// X509_get_subject_name(s->session->peer), NULL, 0))) {
632+
// SSLerr(SSL_F_GMTLS_PROCESS_SKE_SM2DHE, ERR_R_EVP_LIB);
633+
// goto end;
634+
// }
635+
id = SM2_DEFAULT_ID;
634636
zlen = sizeof(z);
635637
if (!SM2_compute_id_digest(EVP_sm3(), id, strlen(id), z, &zlen,
636638
EVP_PKEY_get0_EC_KEY(pkey))) {
@@ -696,7 +698,7 @@ static unsigned char *gmtls_new_cert_packet(X509 *x, int *l)
696698

697699
p = ret;
698700
l2n3(n, p);
699-
*l = n;
701+
*l = n+3;
700702

701703
end:
702704
return ret;
@@ -777,7 +779,7 @@ static int gmtls_construct_ske_sm2(SSL *s, unsigned char **p, int *l, int *al)
777779
SSL3_RANDOM_SIZE) <= 0
778780
|| EVP_SignUpdate(md_ctx, &(s->s3->server_random[0]),
779781
SSL3_RANDOM_SIZE) <= 0
780-
|| EVP_SignUpdate(md_ctx, buf, n+3) <= 0) {
782+
|| EVP_SignUpdate(md_ctx, buf, n) <= 0) {
781783
SSLerr(SSL_F_GMTLS_CONSTRUCT_SKE_SM2, ERR_R_EVP_LIB);
782784
goto end;
783785
}
@@ -887,7 +889,7 @@ static int gmtls_process_ske_sm2(SSL *s, PACKET *pkt, int *al)
887889
SSL3_RANDOM_SIZE) <= 0
888890
|| EVP_VerifyUpdate(md_ctx, &(s->s3->server_random[0]),
889891
SSL3_RANDOM_SIZE) <= 0
890-
|| EVP_VerifyUpdate(md_ctx, buf, n+3) <= 0) {
892+
|| EVP_VerifyUpdate(md_ctx, buf, n) <= 0) {
891893
SSLerr(SSL_F_GMTLS_PROCESS_SKE_SM2, ERR_R_EVP_LIB);
892894
goto end;
893895
}

0 commit comments

Comments
 (0)