mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-03-31 20:10:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Check returns of various sk_*_push functions

Browse Source 
Check returns of sk_POLICY_MAPPING_push, sk_GENERAL_NAME_push,
sk_ACCESS_DESCRIPTION_push, sk_X509_push, sk_X509_NAME_push,
sk_OPENSSL_CSTRING_push, sk_SCT_push, sk_DIST_POINT_push,
sk_OSSL_CMP_CRLSTATUS_push, sk_ASN1_UTF8STRING_push and
sk_ASN1_OBJECT_push and handle appropriately.

Reviewed-by: Saša Nedvědický <sashan@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/26240)
This commit is contained in:
Frederik Wedel-Heinen 2024-12-21 15:15:11 +01:00 committed by Tomas Mraz
parent 3ffa64cd45
commit c626fda8a6
11 changed files with 39 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/crl2pkcs7.c
View File

@ -216,7 +216,10 @@ static int add_certs_from_file(STACK_OF(X509) *stack, char *certfile)
while (sk_X509_INFO_num(sk)) {
xi = sk_X509_INFO_shift(sk);
if (xi->x509 != NULL) {
sk_X509_push(stack, xi->x509);
if (!sk_X509_push(stack, xi->x509)) {
X509_INFO_free(xi);
goto end;
}
xi->x509 = NULL;
count++;
}

9
apps/engine.c
View File

@ -316,7 +316,8 @@ int engine_main(int argc, char **argv)
* names, and then setup to parse the rest of the line as flags. */
prog = argv[0];
while ((argv1 = argv[1]) != NULL && *argv1 != '-') {
sk_OPENSSL_CSTRING_push(engines, argv1);
if (!sk_OPENSSL_CSTRING_push(engines, argv1))
goto end;
argc--;
argv++;
}
@ -370,12 +371,14 @@ int engine_main(int argc, char **argv)
BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
goto end;
}
sk_OPENSSL_CSTRING_push(engines, *argv);
if (!sk_OPENSSL_CSTRING_push(engines, *argv))
goto end;
}
if (sk_OPENSSL_CSTRING_num(engines) == 0) {
for (e = ENGINE_get_first(); e != NULL; e = ENGINE_get_next(e)) {
sk_OPENSSL_CSTRING_push(engines, ENGINE_get_id(e));
if (!sk_OPENSSL_CSTRING_push(engines, ENGINE_get_id(e)))
goto end;
}
}

3
apps/lib/names.c
View File

@ -22,7 +22,8 @@ void collect_names(const char *name, void *vdata)
{
STACK_OF(OPENSSL_CSTRING) *names = vdata;
sk_OPENSSL_CSTRING_push(names, name);
/* A failure to push cannot be handled so we ignore the result. */
(void)sk_OPENSSL_CSTRING_push(names, name);
}
void print_names(BIO *out, STACK_OF(OPENSSL_CSTRING) *names)

6
apps/x509.c
View File

@ -453,7 +453,8 @@ int x509_main(int argc, char **argv)
prog, opt_arg());
goto opthelp;
}
sk_ASN1_OBJECT_push(trust, objtmp);
if (!sk_ASN1_OBJECT_push(trust, objtmp))
goto end;
trustout = 1;
break;
case OPT_ADDREJECT:
@ -464,7 +465,8 @@ int x509_main(int argc, char **argv)
prog, opt_arg());
goto opthelp;
}
sk_ASN1_OBJECT_push(reject, objtmp);
if (!sk_ASN1_OBJECT_push(trust, objtmp))
goto end;
trustout = 1;
break;
case OPT_SETALIAS:

3
crypto/conf/conf_lib.c
View File

@ -228,7 +228,8 @@ static void collect_section_name(const CONF_VALUE *v, SECTION_NAMES *names)
{
/* A section is a CONF_VALUE with name == NULL */
if (v->name == NULL)
sk_OPENSSL_CSTRING_push(names, v->section);
/* A failure to push cannot be handled so we ignore the result. */
(void)sk_OPENSSL_CSTRING_push(names, v->section);
}
static int section_name_cmp(OPENSSL_CSTRING const *a, OPENSSL_CSTRING const *b)

3
crypto/ocsp/ocsp_ext.c
View File

@ -400,7 +400,8 @@ X509_EXTENSION *OCSP_accept_responses_new(char **oids)
goto err;
while (oids && *oids) {
if ((nid = OBJ_txt2nid(*oids)) != NID_undef && (o = OBJ_nid2obj(nid)))
sk_ASN1_OBJECT_push(sk, o);
if (!sk_ASN1_OBJECT_push(sk, o))
goto err;
oids++;
}
x = X509V3_EXT_i2d(NID_id_pkix_OCSP_acceptableResponses, 0, sk);

5
engines/e_capi.c
View File

@ -1771,7 +1771,10 @@ static int capi_load_ssl_client_cert(ENGINE *e, SSL *ssl,
if (!certs)
certs = sk_X509_new_null();
sk_X509_push(certs, x);
if (!sk_X509_push(certs, x)) {
X509_free(x);
continue;
}
} else {
X509_free(x);
}

7
fuzz/x509.c
View File

@ -115,12 +115,11 @@ int FuzzerTestOneInput(const uint8_t *buf, size_t len)
ASN1_GENERALIZEDTIME *revtime, *thisupd, *nextupd;
certs = sk_X509_new_null();
if (certs == NULL)
if (certs == NULL
|| !sk_X509_push(certs, x509_1)
|| !sk_X509_push(certs, x509_2))
goto err;
sk_X509_push(certs, x509_1);
sk_X509_push(certs, x509_2);
OCSP_basic_verify(bs, certs, store, OCSP_PARTIAL_CHAIN);
id = OCSP_cert_to_id(NULL, x509_1, x509_2);

7
test/cmp_client_test.c
View File

@ -187,8 +187,11 @@ static int test_exec_IR_ses(void)
fixture->req_type = OSSL_CMP_PKIBODY_IR;
fixture->expected = OSSL_CMP_PKISTATUS_accepted;
fixture->caPubs = sk_X509_new_null();
sk_X509_push(fixture->caPubs, server_cert);
sk_X509_push(fixture->caPubs, server_cert);
if (!sk_X509_push(fixture->caPubs, server_cert)
|| !sk_X509_push(fixture->caPubs, server_cert)) {
tear_down(fixture);
return 0;
}
ossl_cmp_mock_srv_set1_caPubsOut(fixture->srv_ctx, fixture->caPubs);
EXECUTE_TEST(execute_exec_certrequest_ses_test, tear_down);
return result;

6
test/ct_test.c
View File

@ -463,7 +463,11 @@ static int test_encode_tls_sct(void)
return 0;
}
sk_SCT_push(fixture->sct_list, sct);
if (!sk_SCT_push(fixture->sct_list, sct)) {
tear_down(fixture);
return 0;
}
fixture->sct_dir = ct_dir;
fixture->sct_text_file = "tls1.sct";
EXECUTE_CT_TEST();

3
test/v3nametest.c
View File

@ -157,7 +157,8 @@ static int set_altname(X509 *crt, ...)
default:
abort();
}
sk_GENERAL_NAME_push(gens, gen);
if (!sk_GENERAL_NAME_push(gens, gen))
goto out;
gen = NULL;
}
if (!X509_add1_ext_i2d(crt, NID_subject_alt_name, gens, 0, 0))