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

Fix bugs reported from GitHub code-scanning

Browse Source
This commit is contained in:
Zhi Guan
2026-05-27 10:56:37 +08:00
parent e18bc4212e
commit 087690d892
6 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/lms.c
View File

@@ -725,7 +725,7 @@ int lms_signature_print(FILE *fp, int fmt, int ind, const char *label, const uin
return -1; return -1;
} }
q = GETU32(sig); q = GETU32(sig);
format_print(fp, fmt, ind, "q: %zu\n", q); format_print(fp, fmt, ind, "q: %"PRIu32"\n", q);
sig += 4; sig += 4;
siglen -= 4; siglen -= 4;

2
src/skf/skf.c
View File

@@ -364,7 +364,7 @@ int skf_list_apps(SKF_DEVICE *dev, int fmt, int ind, const char *label, FILE *fp
(void)format_print(fp, fmt, ind, "Application %d:\n", i); (void)format_print(fp, fmt, ind, "Application %d:\n", i);
(void)format_print(fp, fmt, ind + 4, "ApplicationName", name); (void)format_print(fp, fmt, ind + 4, "ApplicationName", name);
(void)format_print(fp, fmt, ind + 4, "AdminPinMaxRetry: %s\n", adminMaxRetry); (void)format_print(fp, fmt, ind + 4, "AdminPinMaxRetry: %u\n", adminMaxRetry);
(void)format_print(fp, fmt, ind + 4, "AdminPinMinRetry: %u\n", adminMinRetry); (void)format_print(fp, fmt, ind + 4, "AdminPinMinRetry: %u\n", adminMinRetry);
(void)format_print(fp, fmt, ind + 4, "AdminDefaultPin: %s\n", adminDefaultPin ? "True" : "False"); (void)format_print(fp, fmt, ind + 4, "AdminDefaultPin: %s\n", adminDefaultPin ? "True" : "False");
(void)format_print(fp, fmt, ind + 4, "UserPinMaxRetry: %u\n", userMaxRetry); (void)format_print(fp, fmt, ind + 4, "UserPinMaxRetry: %u\n", userMaxRetry);

4
src/tls13.c
View File

@@ -350,7 +350,7 @@ Derive-Secret(Secret, Label, Messages) =
*/ */
int tls13_derive_secret(const uint8_t secret[32], const char *label, const DIGEST_CTX *dgst_ctx, uint8_t out[32]) int tls13_derive_secret(const uint8_t secret[32], const char *label, const DIGEST_CTX *dgst_ctx, uint8_t out[32])
{ {
DIGEST_CTX ctx = *dgst_ctx; DIGEST_CTX ctx;
size_t outlen = 32; size_t outlen = 32;
uint8_t context[32]; uint8_t context[32];
size_t context_len; size_t context_len;
@@ -359,6 +359,8 @@ int tls13_derive_secret(const uint8_t secret[32], const char *label, const DIGES
error_print(); error_print();
return -1; return -1;
} }
ctx = *dgst_ctx;
if (digest_finish(&ctx, context, &context_len) != 1) { if (digest_finish(&ctx, context, &context_len) != 1) {
error_print(); error_print();
return -1; return -1;

2
src/tls_trace.c
View File

@@ -977,7 +977,7 @@ int tls_handshake_print(FILE *fp, const uint8_t *handshake, size_t handshakelen,
error_print(); error_print();
return -1; return -1;
} }
format_print(fp, format, indent, "Length: %zu\n", datalen); format_print(fp, format, indent, "Length: %"PRIu32"\n", datalen);
if (tls_array_from_bytes(&data, datalen, &cp, &handshakelen) != 1) { if (tls_array_from_bytes(&data, datalen, &cp, &handshakelen) != 1) {
error_print(); error_print();

2
src/x509_crl.c
View File

@@ -344,7 +344,7 @@ int x509_crl_entry_ext_from_der_ex(int *oid, int *critical,
error_print(); error_print();
return -1; return -1;
} }
if (!cert_issuer) { if (!(*cert_issuer)) {
error_print(); error_print();
return -1; return -1;
} }

14
src/xmss.c
View File

@@ -1091,12 +1091,12 @@ int xmss_signature_print_ex(FILE *fp, int fmt, int ind, const char *label, const
format_bytes(fp, fmt, ind, "random", sig->random, 32); format_bytes(fp, fmt, ind, "random", sig->random, 32);
format_print(fp, fmt, ind, "wots_sig\n"); format_print(fp, fmt, ind, "wots_sig\n");
for (i = 0; i < 67; i++) { for (i = 0; i < 67; i++) {
format_print(fp, fmt, ind+4, "%d", i); format_print(fp, fmt, ind+4, "%zu", i);
format_bytes(fp, fmt, 0, "", sig->wots_sig[i], 32); format_bytes(fp, fmt, 0, "", sig->wots_sig[i], 32);
} }
format_print(fp, fmt, ind, "auth_path\n"); format_print(fp, fmt, ind, "auth_path\n");
for (i = 0; i < height; i++) { for (i = 0; i < height; i++) {
format_print(fp, fmt, ind+4, "%d", i); format_print(fp, fmt, ind+4, "%zu", i);
format_bytes(fp, fmt, 0, "", sig->auth_path[i], 32); format_bytes(fp, fmt, 0, "", sig->auth_path[i], 32);
} }
return 1; return 1;
@@ -1909,7 +1909,7 @@ int xmssmt_private_key_print(FILE *fp, int fmt, int ind, const char *label, cons
xmssmt_public_key_print(fp, fmt, ind, "public_key", key); xmssmt_public_key_print(fp, fmt, ind, "public_key", key);
format_bytes(fp, fmt, ind, "secret", key->secret, 32); format_bytes(fp, fmt, ind, "secret", key->secret, 32);
format_bytes(fp, fmt, ind, "sk_prf", key->sk_prf, 32); format_bytes(fp, fmt, ind, "sk_prf", key->sk_prf, 32);
format_print(fp, fmt, ind, "index: %u\n", key->index); format_print(fp, fmt, ind, "index: %"PRIu64"\n", key->index);
if (xmssmt_type_to_height_and_layers(key->public_key.xmssmt_type, &height, &layers) != 1) { if (xmssmt_type_to_height_and_layers(key->public_key.xmssmt_type, &height, &layers) != 1) {
error_print(); error_print();
@@ -2147,13 +2147,13 @@ int xmssmt_signature_print_ex(FILE *fp, int fmt, int ind, const char *label, con
format_print(fp, fmt, ind, "redurced_xmss_signature[%zu]\n", layer); format_print(fp, fmt, ind, "redurced_xmss_signature[%zu]\n", layer);
format_print(fp, fmt, ind+4, "wots_sig\n"); format_print(fp, fmt, ind+4, "wots_sig\n");
for (i = 0; i < 67; i++) { for (i = 0; i < 67; i++) {
format_print(fp, fmt, ind+8, "%d", i); format_print(fp, fmt, ind+8, "%zu", i);
format_bytes(fp, fmt, 0, "", sig->wots_sigs[layer][i], 32); format_bytes(fp, fmt, 0, "", sig->wots_sigs[layer][i], 32);
} }
format_print(fp, fmt, ind+4, "auth_path\n"); format_print(fp, fmt, ind+4, "auth_path\n");
for (i = 0; i < height/layers; i++) { for (i = 0; i < height/layers; i++) {
format_print(fp, fmt, ind+8, "%d", i); format_print(fp, fmt, ind+8, "%zu", i);
format_bytes(fp, fmt, 0, "", sig->auth_path[(height/layers) * layer + i], 32); format_bytes(fp, fmt, 0, "", sig->auth_path[(height/layers) * layer + i], 32);
} }
} }
@@ -2195,7 +2195,7 @@ int xmssmt_signature_print(FILE *fp, int fmt, int ind, const char *label, const
format_print(fp, fmt, ind, "redurced_xmss_signature[%zu]\n", layer); format_print(fp, fmt, ind, "redurced_xmss_signature[%zu]\n", layer);
format_print(fp, fmt, ind+4, "wots_sig\n"); format_print(fp, fmt, ind+4, "wots_sig\n");
for (i = 0; i < 67; i++) { for (i = 0; i < 67; i++) {
format_print(fp, fmt, ind+4, "%d ", i); format_print(fp, fmt, ind+4, "%zu ", i);
if (siglen < sizeof(xmss_hash256_t)) { if (siglen < sizeof(xmss_hash256_t)) {
error_print(); error_print();
return -1; return -1;
@@ -2206,7 +2206,7 @@ int xmssmt_signature_print(FILE *fp, int fmt, int ind, const char *label, const
} }
format_print(fp, fmt, ind+4, "auth_path\n"); format_print(fp, fmt, ind+4, "auth_path\n");
for (i = 0; i < height/layers; i++) { for (i = 0; i < height/layers; i++) {
format_print(fp, fmt, ind+8, "%d ", i); format_print(fp, fmt, ind+8, "%zu ", i);
if (siglen < sizeof(xmss_hash256_t)) { if (siglen < sizeof(xmss_hash256_t)) {
error_print(); error_print();
return -1; return -1;