mirror of
https://github.com/openssl/openssl.git
synced 2024-11-21 01:15:20 +08:00
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 <levitte@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/25857)
This commit is contained in:
parent
d1669a14d1
commit
ccaa754b5f
@ -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, ""))
|
||||
|
@ -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,
|
||||
|
@ -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)
|
||||
|
@ -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;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user