From ccaa754b5f66cc50d8ecbac48b38268e2acd715e Mon Sep 17 00:00:00 2001 From: ArtSin Date: Mon, 4 Nov 2024 12:56:52 +0400 Subject: [PATCH] Fix uses of `EVP_PKEY_Q_keygen` with `size_t` variadic argument Fix cases where `int` argument was passed instead of `size_t`. CLA: trivial Reviewed-by: Richard Levitte Reviewed-by: Matt Caswell Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/25857) --- test/acvp_test.c | 2 +- test/evp_libctx_test.c | 2 +- test/pairwise_fail_test.c | 2 +- test/threadstest.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/acvp_test.c b/test/acvp_test.c index 944c8c0e48..2bcc886fd2 100644 --- a/test/acvp_test.c +++ b/test/acvp_test.c @@ -1504,7 +1504,7 @@ static int rsa_decryption_primitive_test(int id) BN_CTX *bn_ctx = NULL; const struct rsa_decrypt_prim_st *tst = &rsa_decrypt_prim_data[id]; - if (!TEST_ptr(pkey = EVP_PKEY_Q_keygen(libctx, NULL, "RSA", 2048)) + if (!TEST_ptr(pkey = EVP_PKEY_Q_keygen(libctx, NULL, "RSA", (size_t)2048)) || !TEST_true(pkey_get_bn_bytes(pkey, OSSL_PKEY_PARAM_RSA_N, &n, &n_len)) || !TEST_true(pkey_get_bn_bytes(pkey, OSSL_PKEY_PARAM_RSA_E, &e, &e_len)) || !TEST_ptr(ctx = EVP_PKEY_CTX_new_from_pkey(libctx, pkey, "")) diff --git a/test/evp_libctx_test.c b/test/evp_libctx_test.c index 7e246efd80..9940599b50 100644 --- a/test/evp_libctx_test.c +++ b/test/evp_libctx_test.c @@ -549,7 +549,7 @@ static int rsa_keygen(int bits, EVP_PKEY **pub, EVP_PKEY **priv) size_t len = 0; OSSL_ENCODER_CTX *ectx = NULL; - if (!TEST_ptr(*priv = EVP_PKEY_Q_keygen(libctx, NULL, "RSA", bits)) + if (!TEST_ptr(*priv = EVP_PKEY_Q_keygen(libctx, NULL, "RSA", (size_t)bits)) || !TEST_ptr(ectx = OSSL_ENCODER_CTX_new_for_pkey(*priv, EVP_PKEY_PUBLIC_KEY, diff --git a/test/pairwise_fail_test.c b/test/pairwise_fail_test.c index 128ee92d54..0e46aba2ad 100644 --- a/test/pairwise_fail_test.c +++ b/test/pairwise_fail_test.c @@ -96,7 +96,7 @@ static int test_keygen_pairwise_failure(void) if (strcmp(pairwise_name, "rsa") == 0) { if (!TEST_true(setup_selftest_pairwise_failure(type))) goto err; - if (!TEST_ptr_null(pkey = EVP_PKEY_Q_keygen(libctx, NULL, "RSA", 2048))) + if (!TEST_ptr_null(pkey = EVP_PKEY_Q_keygen(libctx, NULL, "RSA", (size_t)2048))) goto err; } else if (strncmp(pairwise_name, "ec", 2) == 0) { if (strcmp(pairwise_name, "eckat") == 0) diff --git a/test/threadstest.c b/test/threadstest.c index 85d5e11495..faa9e2728c 100644 --- a/test/threadstest.c +++ b/test/threadstest.c @@ -863,7 +863,7 @@ static void thread_general_worker(void) * Therefore we use an insecure bit length where we can (512). * In the FIPS module though we must use a longer length. */ - pkey = EVP_PKEY_Q_keygen(multi_libctx, NULL, "RSA", isfips ? 2048 : 512); + pkey = EVP_PKEY_Q_keygen(multi_libctx, NULL, "RSA", (size_t)(isfips ? 2048 : 512)); if (!TEST_ptr(pkey)) goto err;