mirrors/openssl
0
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2024-11-27 03:54:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix wrong return value checks for some functions

Browse Source 
- in particular in use of X509_LOOKUP_load_file, EVP_PKEY_print_params,
EVP_PKEY_keygen, X509_CRL_add1_ext_i2d, EVP_PKEY_keygen_init

Reviewed-by: Paul Dale <ppzgs1@gmail.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/25811)
This commit is contained in:
Peiwei Hu 2024-10-27 17:53:53 +08:00 committed by Tomas Mraz
parent b2b995ec2d
commit 8baf61d51b
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/ecparam.c
View File

@ -277,7 +277,7 @@ int ecparam_main(int argc, char **argv)
} }
if (text if (text
&& !EVP_PKEY_print_params(out, params_key, 0, NULL)) { && EVP_PKEY_print_params(out, params_key, 0, NULL) <= 0) {
BIO_printf(bio_err, "unable to print params\n"); BIO_printf(bio_err, "unable to print params\n");
goto end; goto end;
} }

2
apps/speed.c
View File

@ -3232,7 +3232,7 @@ int speed_main(int argc, char **argv)
&& EVP_PKEY_CTX_set_rsa_keygen_bits(genctx, rsa_keys[testnum].bits) > 0 && EVP_PKEY_CTX_set_rsa_keygen_bits(genctx, rsa_keys[testnum].bits) > 0
&& EVP_PKEY_CTX_set1_rsa_keygen_pubexp(genctx, bn) > 0 && EVP_PKEY_CTX_set1_rsa_keygen_pubexp(genctx, bn) > 0
&& EVP_PKEY_CTX_set_rsa_keygen_primes(genctx, primes) > 0 && EVP_PKEY_CTX_set_rsa_keygen_primes(genctx, primes) > 0
&& EVP_PKEY_keygen(genctx, &rsa_key); && EVP_PKEY_keygen(genctx, &rsa_key) > 0;
BN_free(bn); BN_free(bn);
bn = NULL; bn = NULL;
EVP_PKEY_CTX_free(genctx); EVP_PKEY_CTX_free(genctx);

2
crypto/x509/x509_vfy.c
View File

@ -2198,7 +2198,7 @@ X509_CRL *X509_CRL_diff(X509_CRL *base, X509_CRL *newer,
} }
/* Set base CRL number: must be critical */ /* Set base CRL number: must be critical */
if (!X509_CRL_add1_ext_i2d(crl, NID_delta_crl, base->crl_number, 1, 0)) { if (X509_CRL_add1_ext_i2d(crl, NID_delta_crl, base->crl_number, 1, 0) <= 0) {
ERR_raise(ERR_LIB_X509, ERR_R_X509_LIB); ERR_raise(ERR_LIB_X509, ERR_R_X509_LIB);
goto err; goto err;
} }

2
test/sslapitest.c
View File

@ -10044,7 +10044,7 @@ static int create_cert_key(int idx, char *certfilename, char *privkeyfilename)
int ret = 1; int ret = 1;
if (!TEST_ptr(evpctx) if (!TEST_ptr(evpctx)
|| !TEST_true(EVP_PKEY_keygen_init(evpctx)) || !TEST_int_gt(EVP_PKEY_keygen_init(evpctx), 0)
|| !TEST_true(EVP_PKEY_generate(evpctx, &pkey)) || !TEST_true(EVP_PKEY_generate(evpctx, &pkey))
|| !TEST_ptr(pkey) || !TEST_ptr(pkey)
|| !TEST_ptr(x509) || !TEST_ptr(x509)

2
test/verify_extra_test.c
View File

@ -75,7 +75,7 @@ static int test_alt_chains_cert_forgery(void)
lookup = X509_STORE_add_lookup(store, X509_LOOKUP_file()); lookup = X509_STORE_add_lookup(store, X509_LOOKUP_file());
if (lookup == NULL) if (lookup == NULL)
goto err; goto err;
if (!X509_LOOKUP_load_file(lookup, roots_f, X509_FILETYPE_PEM)) if (X509_LOOKUP_load_file(lookup, roots_f, X509_FILETYPE_PEM) <= 0)
goto err; goto err;
untrusted = load_certs_pem(untrusted_f); untrusted = load_certs_pem(untrusted_f);