diff --git a/src/lms.c b/src/lms.c index 73065ed3..239e6e67 100644 --- a/src/lms.c +++ b/src/lms.c @@ -725,7 +725,7 @@ int lms_signature_print(FILE *fp, int fmt, int ind, const char *label, const uin return -1; } q = GETU32(sig); - format_print(fp, fmt, ind, "q: %zu\n", q); + format_print(fp, fmt, ind, "q: %"PRIu32"\n", q); sig += 4; siglen -= 4; diff --git a/src/skf/skf.c b/src/skf/skf.c index 08fed460..f726fb68 100755 --- a/src/skf/skf.c +++ b/src/skf/skf.c @@ -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 + 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, "AdminDefaultPin: %s\n", adminDefaultPin ? "True" : "False"); (void)format_print(fp, fmt, ind + 4, "UserPinMaxRetry: %u\n", userMaxRetry); diff --git a/src/tls13.c b/src/tls13.c index 5698bb55..3c96340c 100644 --- a/src/tls13.c +++ b/src/tls13.c @@ -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]) { - DIGEST_CTX ctx = *dgst_ctx; + DIGEST_CTX ctx; size_t outlen = 32; uint8_t context[32]; size_t context_len; @@ -359,6 +359,8 @@ int tls13_derive_secret(const uint8_t secret[32], const char *label, const DIGES error_print(); return -1; } + + ctx = *dgst_ctx; if (digest_finish(&ctx, context, &context_len) != 1) { error_print(); return -1; diff --git a/src/tls_trace.c b/src/tls_trace.c index fe278685..0f0ece76 100644 --- a/src/tls_trace.c +++ b/src/tls_trace.c @@ -977,7 +977,7 @@ int tls_handshake_print(FILE *fp, const uint8_t *handshake, size_t handshakelen, error_print(); 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) { error_print(); diff --git a/src/x509_crl.c b/src/x509_crl.c index 37746b13..5de83f6b 100644 --- a/src/x509_crl.c +++ b/src/x509_crl.c @@ -344,7 +344,7 @@ int x509_crl_entry_ext_from_der_ex(int *oid, int *critical, error_print(); return -1; } - if (!cert_issuer) { + if (!(*cert_issuer)) { error_print(); return -1; } diff --git a/src/xmss.c b/src/xmss.c index 0124995c..bab62f40 100644 --- a/src/xmss.c +++ b/src/xmss.c @@ -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_print(fp, fmt, ind, "wots_sig\n"); 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_print(fp, fmt, ind, "auth_path\n"); 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); } 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); format_bytes(fp, fmt, ind, "secret", key->secret, 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) { 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+4, "wots_sig\n"); 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_print(fp, fmt, ind+4, "auth_path\n"); 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); } } @@ -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+4, "wots_sig\n"); 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)) { error_print(); 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"); 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)) { error_print(); return -1;