abc/GmSSL
1
0
Fork 0
mirror of https://github.com/guanzhi/GmSSL.git synced 2026-06-27 15:43:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update print messages

Browse Source
This commit is contained in:
Zhi Guan
2026-06-20 11:40:27 +08:00
parent 9a25e2a444
commit f84606876a
7 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -831,7 +831,7 @@ endif()
# #
set(CPACK_PACKAGE_NAME "GmSSL") set(CPACK_PACKAGE_NAME "GmSSL")
set(CPACK_PACKAGE_VENDOR "GmSSL develop team") set(CPACK_PACKAGE_VENDOR "GmSSL develop team")
set(CPACK_PACKAGE_VERSION "3.2.0-dev.1116") set(CPACK_PACKAGE_VERSION "3.2.0-dev.1117")
set(CPACK_PACKAGE_DESCRIPTION_FILE ${PROJECT_SOURCE_DIR}/README.md) set(CPACK_PACKAGE_DESCRIPTION_FILE ${PROJECT_SOURCE_DIR}/README.md)
set(CPACK_NSIS_MODIFY_PATH ON) set(CPACK_NSIS_MODIFY_PATH ON)
include(CPack) include(CPack)

2
include/gmssl/version.h
View File

@@ -18,7 +18,7 @@ extern "C" {
#define GMSSL_VERSION_NUM 30200 #define GMSSL_VERSION_NUM 30200
#define GMSSL_VERSION_STR "GmSSL 3.2.0-dev.1116" #define GMSSL_VERSION_STR "GmSSL 3.2.0-dev.1117"
int gmssl_version_num(void); int gmssl_version_num(void);
const char *gmssl_version_str(void); const char *gmssl_version_str(void);

10
src/tls.c
View File

@@ -2341,7 +2341,6 @@ int tls_decrypt_recv(TLS_CONNECT *conn)
seq_num = conn->client_seq_num; seq_num = conn->client_seq_num;
} }
if(conn->verbose) tls_trace("recv Encrypted Record\n");
if (conn->send_state) { if (conn->send_state) {
return TLS_ERROR_SEND_AGAIN; return TLS_ERROR_SEND_AGAIN;
} }
@@ -2453,14 +2452,14 @@ static int tls12_tlcp_recv(TLS_CONNECT *conn, uint8_t *out, size_t outlen, size_
int alert; int alert;
tls_record_get_alert(conn->databuf, &level, &alert); tls_record_get_alert(conn->databuf, &level, &alert);
if (alert == TLS_alert_close_notify) { if (alert == TLS_alert_close_notify) {
if(conn->verbose) tls_trace("recv Alert.close_notify\n"); if(conn->verbose) tls_trace("recv {Alert.close_notify}\n");
conn->close_notify_received = 1; conn->close_notify_received = 1;
conn->data = NULL; conn->data = NULL;
conn->datalen = 0; conn->datalen = 0;
tls_clean_record(conn); tls_clean_record(conn);
return 0; return 0;
} }
if(conn->verbose) tls_trace("alert received\n"); if(conn->verbose) tls_trace("recv {Alert}\n");
conn->data = NULL; conn->data = NULL;
conn->datalen = 0; conn->datalen = 0;
tls_clean_record(conn); tls_clean_record(conn);
@@ -2526,7 +2525,7 @@ static int tls12_send_close_notify(TLS_CONNECT *conn)
seq_num = conn->server_seq_num; seq_num = conn->server_seq_num;
} }
if(conn->verbose) tls_trace("send Alert.close_notify\n"); if(conn->verbose) tls_trace("send {Alert.close_notify}\n");
tls_record_set_alert(conn->plain_record, &conn->plain_recordlen, tls_record_set_alert(conn->plain_record, &conn->plain_recordlen,
TLS_alert_level_warning, TLS_alert_close_notify); TLS_alert_level_warning, TLS_alert_close_notify);
@@ -2579,7 +2578,7 @@ static int tls13_send_close_notify(TLS_CONNECT *conn)
seq_num = conn->server_seq_num; seq_num = conn->server_seq_num;
} }
if(conn->verbose) tls_trace("send Alert.close_notify\n"); if(conn->verbose) tls_trace("send {Alert.close_notify}\n");
tls_record_set_alert(conn->plain_record, &conn->plain_recordlen, tls_record_set_alert(conn->plain_record, &conn->plain_recordlen,
TLS_alert_level_warning, TLS_alert_close_notify); TLS_alert_level_warning, TLS_alert_close_notify);
@@ -2667,7 +2666,6 @@ int tls_shutdown(TLS_CONNECT *conn)
} }
if (conn->shutdown_state == TLS_state_shutdown_recv_close_notify) { if (conn->shutdown_state == TLS_state_shutdown_recv_close_notify) {
if(conn->verbose) tls_trace("recv Alert.close_notify\n");
for (;;) { for (;;) {
ret = tls_recv(conn, buf, sizeof(buf), &len); ret = tls_recv(conn, buf, sizeof(buf), &len);
if (ret == 1 && len > 0) { if (ret == 1 && len > 0) {

4
src/tls12.c
View File

@@ -1925,7 +1925,7 @@ int tls_recv_server_finished(TLS_CONNECT *conn)
return ret; return ret;
} }
if(conn->verbose) if(conn->verbose)
tls_trace("recv server Finished\n"); tls_trace("recv server {Finished}\n");
if (tls_record_protocol(conn->record) != conn->protocol) { if (tls_record_protocol(conn->record) != conn->protocol) {
error_print(); error_print();
@@ -2989,7 +2989,7 @@ int tls_send_server_finished(TLS_CONNECT *conn)
tls_record_set_protocol(conn->plain_record, conn->protocol); tls_record_set_protocol(conn->plain_record, conn->protocol);
if (conn->recordlen == 0) { if (conn->recordlen == 0) {
if(conn->verbose) tls_trace("send server Finished\n"); if(conn->verbose) tls_trace("send server {Finished}\n");
if (tls_compute_verify_data(conn->digest, conn->master_secret, if (tls_compute_verify_data(conn->digest, conn->master_secret,
"server finished", &conn->dgst_ctx, local_verify_data) != 1) { "server finished", &conn->dgst_ctx, local_verify_data) != 1) {

4
src/tls13.c
View File

@@ -1387,7 +1387,7 @@ int tls13_do_recv(TLS_CONNECT *conn)
conn->recordlen = tls_record_length(conn->record); conn->recordlen = tls_record_length(conn->record);
if(conn->verbose) tls_trace("recv {ApplicationData}\n"); if(conn->verbose) tls_trace("recv {Record}\n");
tls13_record_print(stderr, 0, 0, conn->record, conn->recordlen); tls13_record_print(stderr, 0, 0, conn->record, conn->recordlen);
@@ -1511,7 +1511,7 @@ int tls13_do_recv(TLS_CONNECT *conn)
return -1; return -1;
} }
if (alert_description == TLS_alert_close_notify) { if (alert_description == TLS_alert_close_notify) {
if(conn->verbose) tls_trace("recv Alert.close_notify\n"); if(conn->verbose) tls_trace("recv {Alert.close_notify}\n");
conn->close_notify_received = 1; conn->close_notify_received = 1;
conn->data = NULL; conn->data = NULL;
conn->datalen = 0; conn->datalen = 0;

10
src/tls_trace.c
View File

@@ -1168,7 +1168,7 @@ int tls_connect_print(FILE *fp, int fmt, int ind, const char *label, const TLS_C
format_print(fp, fmt, ind, "%s\n", TLS_CONNECTION_ESTABLISHED_STRING); format_print(fp, fmt, ind, "%s\n", TLS_CONNECTION_ESTABLISHED_STRING);
format_print(fp, fmt, ind, "Protocol: %s\n", tls_protocol_name(conn->protocol)); format_print(fp, fmt, ind, "Protocol: %s\n", tls_protocol_name(conn->protocol));
format_print(fp, fmt, ind, "Cipher suite: %s\n", tls_cipher_suite_name(conn->cipher_suite)); format_print(fp, fmt, ind, "CipherSuite: %s\n", tls_cipher_suite_name(conn->cipher_suite));
if (conn->alpn_selected) { if (conn->alpn_selected) {
format_print(fp, fmt, ind, "ALPN protocol: %s\n", conn->alpn_selected); format_print(fp, fmt, ind, "ALPN protocol: %s\n", conn->alpn_selected);
} }
@@ -1177,13 +1177,14 @@ int tls_connect_print(FILE *fp, int fmt, int ind, const char *label, const TLS_C
&& x509_certs_get_cert_by_index(conn->peer_cert_chain, && x509_certs_get_cert_by_index(conn->peer_cert_chain,
conn->peer_cert_chain_len, 0, &cert, &certlen) == 1) { conn->peer_cert_chain_len, 0, &cert, &certlen) == 1) {
if (x509_cert_get_subject(cert, certlen, &name, &namelen) == 1) { if (x509_cert_get_subject(cert, certlen, &name, &namelen) == 1) {
x509_name_print(fp, fmt, ind, "Peer certificate subject", name, namelen); x509_name_print(fp, fmt, ind, "Certificate.subject", name, namelen);
} }
if (x509_cert_get_issuer(cert, certlen, &name, &namelen) == 1) { if (x509_cert_get_issuer(cert, certlen, &name, &namelen) == 1) {
x509_name_print(fp, fmt, ind, "Peer certificate issuer", name, namelen); x509_name_print(fp, fmt, ind, "Certificate.issuer", name, namelen);
} }
} }
fprintf(fp, "\n");
return 1; return 1;
} }
@@ -1291,7 +1292,7 @@ int tls_encrypted_record_print(FILE *fp, const uint8_t *record, size_t recordle
} }
protocol = tls_record_protocol(record); protocol = tls_record_protocol(record);
format_print(fp, fmt, ind, "EncryptedRecord\n"); ind += 4; format_print(fp, fmt, ind, "recv {Record}\n"); ind += 4;
format_print(fp, fmt, ind, "ContentType: %s (%d)\n", tls_record_type_name(record[0]), record[0]); format_print(fp, fmt, ind, "ContentType: %s (%d)\n", tls_record_type_name(record[0]), record[0]);
format_print(fp, fmt, ind, "Version: %s (%04x)\n", tls_protocol_name(protocol), protocol); format_print(fp, fmt, ind, "Version: %s (%04x)\n", tls_protocol_name(protocol), protocol);
format_print(fp, fmt, ind, "Length: %d\n", tls_record_data_length(record)); format_print(fp, fmt, ind, "Length: %d\n", tls_record_data_length(record));
@@ -1341,6 +1342,7 @@ int tls_handshake_digest_print(FILE *fp, int fmt, int ind, const char *label, co
format_print(fp, fmt, ind, "transcript_hash "); format_print(fp, fmt, ind, "transcript_hash ");
format_bytes(fp, 0, 0, label, dgst, dgstlen); format_bytes(fp, 0, 0, label, dgst, dgstlen);
fprintf(fp, "\n");
return 1; return 1;
} }

1
tools/tls13_client.c
View File

@@ -817,7 +817,6 @@ bad:
} }
tls_connect_print(stderr, 0, 0, NULL, &conn); tls_connect_print(stderr, 0, 0, NULL, &conn);
fprintf(stderr, "\n");
if (get) { if (get) {
snprintf(buf, sizeof(buf), "GET %s HTTP/1.1\r\nHost: %s\r\n\r\n", get, host); snprintf(buf, sizeof(buf), "GET %s HTTP/1.1\r\nHost: %s\r\n\r\n", get, host);