wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Continue standardisation of malloc handling in apps

Browse source 
continue on from previous commits but in the apps directory

Reviewed-by: Kurt Roeckx <kurt@openssl.org>
This commit is contained in:
Matt Caswell 2015-10-30 11:18:04 +00:00
parent 90945fa31a
commit 96487cddd4
16 changed files with 46 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
apps/apps.c
View file

@ -646,7 +646,7 @@ int load_cert_crl_http(const char *url, X509 **pcert, X509_CRL **pcrl)
if (!bio || !BIO_set_conn_port(bio, port))
goto err;
rctx = OCSP_REQ_CTX_new(bio, 1024);
if (!rctx)
if (rctx == NULL)
goto err;
if (!OCSP_REQ_CTX_http(rctx, "GET", path))
goto err;
@ -856,7 +856,7 @@ EVP_PKEY *load_pubkey(const char *file, int format, int maybe_stdin,
rsa = d2i_RSAPublicKey_bio(key, NULL);
if (rsa) {
pkey = EVP_PKEY_new();
if (pkey)
if (pkey != NULL)
EVP_PKEY_set1_RSA(pkey, rsa);
RSA_free(rsa);
} else
@ -866,9 +866,9 @@ EVP_PKEY *load_pubkey(const char *file, int format, int maybe_stdin,
rsa = PEM_read_bio_RSAPublicKey(key, NULL,
(pem_password_cb *)password_callback,
&cb_data);
if (rsa) {
if (rsa != NULL) {
pkey = EVP_PKEY_new();
if (pkey)
if (pkey != NULL)
EVP_PKEY_set1_RSA(pkey, rsa);
RSA_free(rsa);
} else
@ -1252,7 +1252,7 @@ X509_STORE *setup_verify(char *CAfile, char *CApath, int noCAfile, int noCApath)
X509_STORE *store = X509_STORE_new();
X509_LOOKUP *lookup;
if (!store)
if (store == NULL)
goto end;
if(CAfile != NULL || !noCAfile) {
@ -1541,7 +1541,7 @@ int rand_serial(BIGNUM *b, ASN1_INTEGER *ai)
else
btmp = BN_new();
if (!btmp)
if (btmp == NULL)
return 0;
if (!BN_pseudo_rand(btmp, SERIAL_RAND_BITS, 0, 0))
@ -1901,7 +1901,7 @@ int bio_to_mem(unsigned char **out, int maxlen, BIO *in)
int len, ret;
unsigned char tbuf[1024];
mem = BIO_new(BIO_s_mem());
if (!mem)
if (mem == NULL)
return -1;
for (;;) {
if ((maxlen != -1) && maxlen < 1024)

12
apps/ca.c
View file

@ -1165,7 +1165,7 @@ end_of_options:
goto end;
tmptm = ASN1_TIME_new();
if (!tmptm)
if (tmptm == NULL)
goto end;
X509_gmtime_adj(tmptm, 0);
X509_CRL_set_lastUpdate(crl, tmptm);
@ -2283,10 +2283,12 @@ static int do_updatedb(CA_DB *db)
char **rrow, *a_tm_s;
a_tm = ASN1_UTCTIME_new();
if (a_tm == NULL)
return -1;
/* get actual time and make a string */
a_tm = X509_gmtime_adj(a_tm, 0);
a_tm_s = (char *)OPENSSL_malloc(a_tm->length + 1);
a_tm_s = (char *)app_malloc(a_tm->length + 1, "time string");
memcpy(a_tm_s, a_tm->data, a_tm->length);
a_tm_s[a_tm->length] = '\0';
@ -2470,7 +2472,7 @@ int make_revoked(X509_REVOKED *rev, const char *str)
if (rev && (reason_code != OCSP_REVOKED_STATUS_NOSTATUS)) {
rtmp = ASN1_ENUMERATED_new();
if (!rtmp || !ASN1_ENUMERATED_set(rtmp, reason_code))
if (rtmp == NULL || !ASN1_ENUMERATED_set(rtmp, reason_code))
goto end;
if (!X509_REVOKED_add1_ext_i2d(rev, NID_crl_reason, rtmp, 0, 0))
goto end;
@ -2576,7 +2578,7 @@ int unpack_revinfo(ASN1_TIME **prevtm, int *preason, ASN1_OBJECT **phold,
if (prevtm) {
*prevtm = ASN1_UTCTIME_new();
if (!*prevtm) {
if (*prevtm == NULL) {
BIO_printf(bio_err, "memory allocation failure\n");
goto end;
}
@ -2622,7 +2624,7 @@ int unpack_revinfo(ASN1_TIME **prevtm, int *preason, ASN1_OBJECT **phold,
goto end;
}
comp_time = ASN1_GENERALIZEDTIME_new();
if (!comp_time) {
if (comp_time == NULL) {
BIO_printf(bio_err, "memory allocation failure\n");
goto end;
}

2
apps/cms.c
View file

@ -1269,7 +1269,7 @@ static STACK_OF(GENERAL_NAMES) *make_names_stack(STACK_OF(OPENSSL_STRING) *ns)
if (!gen)
goto err;
gens = GENERAL_NAMES_new();
if (!gens)
if (gens == NULL)
goto err;
if (!sk_GENERAL_NAME_push(gens, gen))
goto err;

6
apps/dhparam.c
View file

@ -251,7 +251,7 @@ int dhparam_main(int argc, char **argv)
BN_GENCB *cb;
cb = BN_GENCB_new();
if (!cb) {
if (cb == NULL) {
ERR_print_errors(bio_err);
goto end;
}
@ -271,7 +271,7 @@ int dhparam_main(int argc, char **argv)
BIO_printf(bio_err,
"Generating DSA parameters, %d bit long prime\n", num);
if (!dsa
if (dsa == NULL
|| !DSA_generate_parameters_ex(dsa, num, NULL, 0, NULL, NULL,
cb)) {
DSA_free(dsa);
@ -295,7 +295,7 @@ int dhparam_main(int argc, char **argv)
"Generating DH parameters, %d bit long safe prime, generator %d\n",
num, g);
BIO_printf(bio_err, "This is going to take a long time\n");
if (!dh || !DH_generate_parameters_ex(dh, num, g, cb)) {
if (dh == NULL || !DH_generate_parameters_ex(dh, num, g, cb)) {
BN_GENCB_free(cb);
ERR_print_errors(bio_err);
goto end;

4
apps/dsaparam.c
View file

@ -208,14 +208,14 @@ int dsaparam_main(int argc, char **argv)
if (numbits > 0) {
cb = BN_GENCB_new();
if (!cb) {
if (cb == NULL) {
BIO_printf(bio_err, "Error allocating BN_GENCB object\n");
goto end;
}
BN_GENCB_set(cb, dsa_cb, bio_err);
assert(need_rand);
dsa = DSA_new();
if (!dsa) {
if (dsa == NULL) {
BIO_printf(bio_err, "Error allocating DSA object\n");
goto end;
}

2
apps/genpkey.c
View file

@ -269,7 +269,7 @@ static int init_keygen_file(EVP_PKEY_CTX **pctx, const char *file, ENGINE *e)
}
ctx = EVP_PKEY_CTX_new(pkey, e);
if (!ctx)
if (ctx == NULL)
goto err;
if (EVP_PKEY_keygen_init(ctx) <= 0)
goto err;

4
apps/genrsa.c
View file

@ -114,7 +114,7 @@ int genrsa_main(int argc, char **argv)
char *inrand = NULL, *prog, *hexe, *dece;
OPTION_CHOICE o;
if (!bn || !cb)
if (bn == NULL || cb == NULL)
goto end;
BN_GENCB_set(cb, genrsa_cb, bio_err);
@ -185,7 +185,7 @@ int genrsa_main(int argc, char **argv)
BIO_printf(bio_err, "Generating RSA private key, %d bit long modulus\n",
num);
rsa = e ? RSA_new_method(e) : RSA_new();
if (!rsa)
if (rsa == NULL)
goto end;
if (non_fips_allow)

4
apps/nseq.c
View file

@ -118,8 +118,10 @@ int nseq_main(int argc, char **argv)
if (toseq) {
seq = NETSCAPE_CERT_SEQUENCE_new();
if (seq == NULL)
goto end;
seq->certs = sk_X509_new_null();
if (!seq->certs)
if (seq->certs == NULL)
goto end;
while ((x509 = PEM_read_bio_X509(in, NULL, NULL, NULL)))
sk_X509_push(seq->certs, x509);

14
apps/ocsp.c
View file

@ -783,9 +783,9 @@ static int add_ocsp_cert(OCSP_REQUEST **req, X509 *cert,
BIO_printf(bio_err, "No issuer certificate specified\n");
return 0;
}
if (!*req)
if (*req == NULL)
*req = OCSP_REQUEST_new();
if (!*req)
if (*req == NULL)
goto err;
id = OCSP_cert_to_id(cert_id_md, cert, issuer);
if (!id || !sk_OCSP_CERTID_push(ids, id))
@ -811,9 +811,9 @@ static int add_ocsp_serial(OCSP_REQUEST **req, char *serial,
BIO_printf(bio_err, "No issuer certificate specified\n");
return 0;
}
if (!*req)
if (*req == NULL)
*req = OCSP_REQUEST_new();
if (!*req)
if (*req == NULL)
goto err;
iname = X509_get_subject_name(issuer);
ikey = X509_get0_pubkey_bitstr(issuer);
@ -824,7 +824,7 @@ static int add_ocsp_serial(OCSP_REQUEST **req, char *serial,
}
id = OCSP_cert_id_new(cert_id_md, iname, ikey, sno);
ASN1_INTEGER_free(sno);
if (!id || !sk_OCSP_CERTID_push(ids, id))
if (id == NULL || !sk_OCSP_CERTID_push(ids, id))
goto err;
if (!OCSP_request_add0_id(*req, id))
goto err;
@ -1029,7 +1029,7 @@ static BIO *init_responder(const char *port)
return NULL;
# endif
bufbio = BIO_new(BIO_f_buffer());
if (!bufbio)
if (bufbio == NULL)
goto err;
acbio = BIO_new(BIO_s_accept());
if (acbio == NULL
@ -1220,7 +1220,7 @@ static OCSP_RESPONSE *query_responder(BIO *cbio, const char *host,
}
ctx = OCSP_sendreq_new(cbio, path, NULL, -1);
if (!ctx)
if (ctx == NULL)
return NULL;
for (i = 0; i < sk_CONF_VALUE_num(headers); i++) {

2
apps/pkeyutl.c
View file

@ -376,7 +376,7 @@ static EVP_PKEY_CTX *init_ctx(int *pkeysize,
EVP_PKEY_free(pkey);
if (!ctx)
if (ctx == NULL)
goto end;
switch (pkey_op) {

2
apps/req.c
View file

@ -1442,7 +1442,7 @@ static EVP_PKEY_CTX *set_keygen_ctx(const char *gstr,
} else
gctx = EVP_PKEY_CTX_new_id(*pkey_type, keygen_engine);
if (!gctx) {
if (gctx == NULL) {
BIO_puts(bio_err, "Error allocating keygen context\n");
ERR_print_errors(bio_err);
return NULL;

8
apps/s_cb.c
View file

@ -1279,8 +1279,10 @@ int ssl_load_stores(SSL_CTX *ctx,
{
X509_STORE *vfy = NULL, *ch = NULL;
int rv = 0;
if (vfyCApath || vfyCAfile) {
if (vfyCApath != NULL || vfyCAfile != NULL) {
vfy = X509_STORE_new();
if (vfy == NULL)
goto err;
if (!X509_STORE_load_locations(vfy, vfyCAfile, vfyCApath))
goto err;
add_crls_store(vfy, crls);
@ -1288,8 +1290,10 @@ int ssl_load_stores(SSL_CTX *ctx,
if (crl_download)
store_setup_crl_download(vfy);
}
if (chCApath || chCAfile) {
if (chCApath != NULL || chCAfile != NULL) {
ch = X509_STORE_new();
if (ch == NULL)
goto err;
if (!X509_STORE_load_locations(ch, chCAfile, chCApath))
goto err;
SSL_CTX_set1_chain_cert_store(ctx, ch);

2
apps/s_server.c
View file

@ -667,7 +667,7 @@ static int cert_status_cb(SSL *s, void *arg)
goto done;
}
req = OCSP_REQUEST_new();
if (!req)
if (req == NULL)
goto err;
id = OCSP_cert_to_id(NULL, x, obj.data.x509);
X509_free(obj.data.x509);

2
apps/spkac.c
View file

@ -189,7 +189,7 @@ int spkac_main(int argc, char **argv)
spkstr = NCONF_get_string(conf, spksect, spkac);
if (!spkstr) {
if (spkstr == NULL) {
BIO_printf(bio_err, "Can't find SPKAC called \"%s\"\n", spkac);
ERR_print_errors(bio_err);
goto end;

4
apps/ts.c
View file

@ -947,7 +947,7 @@ static X509_STORE *create_cert_store(char *CApath, char *CAfile)
cert_ctx = X509_STORE_new();
X509_STORE_set_verify_cb(cert_ctx, verify_cb);
if (CApath) {
if (CApath != NULL) {
lookup = X509_STORE_add_lookup(cert_ctx, X509_LOOKUP_hash_dir());
if (lookup == NULL) {
BIO_printf(bio_err, "memory allocation failure\n");
@ -960,7 +960,7 @@ static X509_STORE *create_cert_store(char *CApath, char *CAfile)
}
}
if (CAfile) {
if (CAfile != NULL) {
lookup = X509_STORE_add_lookup(cert_ctx, X509_LOOKUP_file());
if (lookup == NULL) {
BIO_printf(bio_err, "memory allocation failure\n");

2
apps/x509.c
View file

@ -590,7 +590,7 @@ int x509_main(int argc, char **argv)
if (sno == NULL) {
sno = ASN1_INTEGER_new();
if (!sno || !rand_serial(NULL, sno))
if (sno == NULL || !rand_serial(NULL, sno))
goto end;
if (!X509_set_serialNumber(x, sno))
goto end;