From 419eaca7621d0c2b32028b471d214ea5c7db32f1 Mon Sep 17 00:00:00 2001 From: Zhi Guan Date: Tue, 16 Jun 2026 23:51:36 +0800 Subject: [PATCH] Update tlcp.c --- CMakeLists.txt | 2 +- include/gmssl/version.h | 2 +- src/tlcp.c | 32 +++----------------------------- 3 files changed, 5 insertions(+), 31 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4ed48051..8308dab8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -818,7 +818,7 @@ endif() # set(CPACK_PACKAGE_NAME "GmSSL") set(CPACK_PACKAGE_VENDOR "GmSSL develop team") -set(CPACK_PACKAGE_VERSION "3.2.0-dev.1065") +set(CPACK_PACKAGE_VERSION "3.2.0-dev.1066") set(CPACK_PACKAGE_DESCRIPTION_FILE ${PROJECT_SOURCE_DIR}/README.md) set(CPACK_NSIS_MODIFY_PATH ON) include(CPack) diff --git a/include/gmssl/version.h b/include/gmssl/version.h index 50ddfa4c..d8b08d40 100644 --- a/include/gmssl/version.h +++ b/include/gmssl/version.h @@ -18,7 +18,7 @@ extern "C" { #define GMSSL_VERSION_NUM 30200 -#define GMSSL_VERSION_STR "GmSSL 3.2.0-dev.1065" +#define GMSSL_VERSION_STR "GmSSL 3.2.0-dev.1066" int gmssl_version_num(void); const char *gmssl_version_str(void); diff --git a/src/tlcp.c b/src/tlcp.c index a6591e4c..54554c0b 100644 --- a/src/tlcp.c +++ b/src/tlcp.c @@ -929,11 +929,12 @@ int tlcp_recv_certificate_request(TLS_CONNECT *conn) return -1; } if (handshake_type != TLS_handshake_certificate_request) { - conn->client_certs_len = 0; return 0; } - if(conn->verbose) tls_trace("recv CertificateRequest\n"); + if (conn->verbose) + tls_trace("recv CertificateRequest\n"); + if (conn->verbose) tls_record_print(stderr, 0, 0, conn->cipher_suite, conn->record, conn->recordlen); @@ -1638,33 +1639,6 @@ int tlcp_send_server_key_exchange(TLS_CONNECT *conn) return 1; } -static void tlcp_secrets_print(TLS_CONNECT *conn) -{ - if (conn->verbose < 5) { - return; - } - - if (conn->cipher_suite == TLS_cipher_ecc_sm4_gcm_sm3) { - size_t keylen = conn->cipher->key_size; - - format_bytes(stderr, 0, 4, "pre_master_secret", conn->pre_master_secret, 48); - format_bytes(stderr, 0, 4, "client_random", conn->client_random, 32); - format_bytes(stderr, 0, 4, "server_random", conn->server_random, 32); - format_bytes(stderr, 0, 4, "master_secret", conn->master_secret, 48); - format_bytes(stderr, 0, 4, "client_write_key", conn->key_block, keylen); - format_bytes(stderr, 0, 4, "server_write_key", conn->key_block + keylen, keylen); - format_bytes(stderr, 0, 4, "client_write_iv", conn->client_write_iv, 4); - format_bytes(stderr, 0, 4, "server_write_iv", conn->server_write_iv, 4); - } else { - tls_secrets_print(stderr, - conn->pre_master_secret, 48, - conn->client_random, conn->server_random, - conn->master_secret, - conn->key_block, 96, - 0, 4); - } -} - int tlcp_generate_pre_master_secret(TLS_CONNECT *conn) { uint8_t *pre_master_secret;