projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
more OSSL_NELEM cases
[openssl.git]
/
apps
/
ca.c
diff --git
a/apps/ca.c
b/apps/ca.c
index a3e0bdac9e707e2e0323d837d3db010b3adf25f7..2f43a9bc7f89542d672901a8a8fc9f4b6f69761c 100644
(file)
--- a/
apps/ca.c
+++ b/
apps/ca.c
@@
-491,21
+491,11
@@
end_of_options:
const char *s = X509_get_default_cert_area();
size_t len;
const char *s = X509_get_default_cert_area();
size_t len;
+ len = strlen(s) + 1 + sizeof(CONFIG_FILE);
+ tofree = app_malloc(len, "config filename");
#ifdef OPENSSL_SYS_VMS
#ifdef OPENSSL_SYS_VMS
- len = strlen(s) + sizeof(CONFIG_FILE);
- tofree = OPENSSL_malloc(len);
- if (!tofree) {
- BIO_printf(bio_err, "Out of memory\n");
- goto end;
- }
strcpy(tofree, s);
#else
strcpy(tofree, s);
#else
- len = strlen(s) + sizeof(CONFIG_FILE) + 1;
- tofree = OPENSSL_malloc(len);
- if (!tofree) {
- BIO_printf(bio_err, "Out of memory\n");
- goto end;
- }
BUF_strlcpy(tofree, s, len);
BUF_strlcat(tofree, "/", len);
#endif
BUF_strlcpy(tofree, s, len);
BUF_strlcat(tofree, "/", len);
#endif
@@
-524,10
+514,8
@@
end_of_options:
errorline, configfile);
goto end;
}
errorline, configfile);
goto end;
}
- if (tofree) {
- OPENSSL_free(tofree);
- tofree = NULL;
- }
+ OPENSSL_free(tofree);
+ tofree = NULL;
/* Lets get the config section we are using */
if (section == NULL) {
/* Lets get the config section we are using */
if (section == NULL) {
@@
-1299,10
+1287,8
@@
end_of_options:
if (!save_serial(crlnumberfile, "new", crlnumber, NULL))
goto end;
if (!save_serial(crlnumberfile, "new", crlnumber, NULL))
goto end;
- if (crlnumber) {
- BN_free(crlnumber);
- crlnumber = NULL;
- }
+ BN_free(crlnumber);
+ crlnumber = NULL;
if (!do_X509_CRL_sign(crl, pkey, dgst, sigopts))
goto end;
if (!do_X509_CRL_sign(crl, pkey, dgst, sigopts))
goto end;
@@
-1343,8
+1329,7
@@
end_of_options:
/*****************************************************************/
ret = 0;
end:
/*****************************************************************/
ret = 0;
end:
- if (tofree)
- OPENSSL_free(tofree);
+ OPENSSL_free(tofree);
BIO_free_all(Cout);
BIO_free_all(Sout);
BIO_free_all(out);
BIO_free_all(Cout);
BIO_free_all(Sout);
BIO_free_all(out);
@@
-1354,13
+1339,12
@@
end_of_options:
if (ret)
ERR_print_errors(bio_err);
app_RAND_write_file(randfile);
if (ret)
ERR_print_errors(bio_err);
app_RAND_write_file(randfile);
- if (free_key
&& key
)
+ if (free_key)
OPENSSL_free(key);
BN_free(serial);
BN_free(crlnumber);
free_index(db);
OPENSSL_free(key);
BN_free(serial);
BN_free(crlnumber);
free_index(db);
- if (sigopts)
- sk_OPENSSL_STRING_free(sigopts);
+ sk_OPENSSL_STRING_free(sigopts);
EVP_PKEY_free(pkey);
X509_free(x509);
X509_CRL_free(crl);
EVP_PKEY_free(pkey);
X509_free(x509);
X509_CRL_free(crl);
@@
-1975,17
+1959,17
@@
static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509,
goto end;
/* We now just add it to the database */
goto end;
/* We now just add it to the database */
- row[DB_type] =
OPENSSL_malloc(2
);
+ row[DB_type] =
app_malloc(2, "row db type"
);
tm = X509_get_notAfter(ret);
tm = X509_get_notAfter(ret);
- row[DB_exp_date] =
OPENSSL_malloc(tm->length + 1
);
+ row[DB_exp_date] =
app_malloc(tm->length + 1, "row expdate"
);
memcpy(row[DB_exp_date], tm->data, tm->length);
row[DB_exp_date][tm->length] = '\0';
row[DB_rev_date] = NULL;
/* row[DB_serial] done already */
memcpy(row[DB_exp_date], tm->data, tm->length);
row[DB_exp_date][tm->length] = '\0';
row[DB_rev_date] = NULL;
/* row[DB_serial] done already */
- row[DB_file] =
OPENSSL_malloc(8
);
+ row[DB_file] =
app_malloc(8, "row file"
);
row[DB_name] = X509_NAME_oneline(X509_get_subject_name(ret), NULL, 0);
if ((row[DB_type] == NULL) || (row[DB_exp_date] == NULL) ||
row[DB_name] = X509_NAME_oneline(X509_get_subject_name(ret), NULL, 0);
if ((row[DB_type] == NULL) || (row[DB_exp_date] == NULL) ||
@@
-1997,11
+1981,7
@@
static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509,
row[DB_type][0] = 'V';
row[DB_type][1] = '\0';
row[DB_type][0] = 'V';
row[DB_type][1] = '\0';
- if ((irow = OPENSSL_malloc(sizeof(char *) * (DB_NUMBER + 1))) == NULL) {
- BIO_printf(bio_err, "Memory allocation failure\n");
- goto end;
- }
-
+ irow = app_malloc(sizeof(char *) * (DB_NUMBER + 1), "row space");
for (i = 0; i < DB_NUMBER; i++) {
irow[i] = row[i];
row[i] = NULL;
for (i = 0; i < DB_NUMBER; i++) {
irow[i] = row[i];
row[i] = NULL;
@@
-2016,8
+1996,7
@@
static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509,
ok = 1;
end:
for (i = 0; i < DB_NUMBER; i++)
ok = 1;
end:
for (i = 0; i < DB_NUMBER; i++)
- if (row[i] != NULL)
- OPENSSL_free(row[i]);
+ OPENSSL_free(row[i]);
X509_NAME_free(CAname);
X509_NAME_free(subject);
X509_NAME_free(CAname);
X509_NAME_free(subject);
@@
-2175,10
+2154,8
@@
static int certify_spkac(X509 **xret, char *infile, EVP_PKEY *pkey,
ext_copy, 0);
end:
X509_REQ_free(req);
ext_copy, 0);
end:
X509_REQ_free(req);
- if (parms != NULL)
- CONF_free(parms);
- if (spki != NULL)
- NETSCAPE_SPKI_free(spki);
+ CONF_free(parms);
+ NETSCAPE_SPKI_free(spki);
X509_NAME_ENTRY_free(ne);
return (ok);
X509_NAME_ENTRY_free(ne);
return (ok);
@@
-2223,34
+2200,25
@@
static int do_revoke(X509 *x509, CA_DB *db, int type, char *value)
row[DB_serial], row[DB_name]);
/* We now just add it to the database */
row[DB_serial], row[DB_name]);
/* We now just add it to the database */
- row[DB_type] =
OPENSSL_malloc(2
);
+ row[DB_type] =
app_malloc(2, "row type"
);
tm = X509_get_notAfter(x509);
tm = X509_get_notAfter(x509);
- row[DB_exp_date] =
OPENSSL_malloc(tm->length + 1
);
+ row[DB_exp_date] =
app_malloc(tm->length + 1, "row exp_data"
);
memcpy(row[DB_exp_date], tm->data, tm->length);
row[DB_exp_date][tm->length] = '\0';
row[DB_rev_date] = NULL;
/* row[DB_serial] done already */
memcpy(row[DB_exp_date], tm->data, tm->length);
row[DB_exp_date][tm->length] = '\0';
row[DB_rev_date] = NULL;
/* row[DB_serial] done already */
- row[DB_file] =
OPENSSL_malloc(8
);
+ row[DB_file] =
app_malloc(8, "row filename"
);
/* row[DB_name] done already */
/* row[DB_name] done already */
- if ((row[DB_type] == NULL) || (row[DB_exp_date] == NULL) ||
- (row[DB_file] == NULL)) {
- BIO_printf(bio_err, "Memory allocation failure\n");
- goto end;
- }
BUF_strlcpy(row[DB_file], "unknown", 8);
row[DB_type][0] = 'V';
row[DB_type][1] = '\0';
BUF_strlcpy(row[DB_file], "unknown", 8);
row[DB_type][0] = 'V';
row[DB_type][1] = '\0';
- if ((irow = OPENSSL_malloc(sizeof(char *) * (DB_NUMBER + 1))) == NULL) {
- BIO_printf(bio_err, "Memory allocation failure\n");
- goto end;
- }
-
+ irow = app_malloc(sizeof(char *) * (DB_NUMBER + 1), "row ptr");
for (i = 0; i < DB_NUMBER; i++) {
irow[i] = row[i];
row[i] = NULL;
for (i = 0; i < DB_NUMBER; i++) {
irow[i] = row[i];
row[i] = NULL;
@@
-2296,8
+2264,7
@@
static int do_revoke(X509 *x509, CA_DB *db, int type, char *value)
ok = 1;
end:
for (i = 0; i < DB_NUMBER; i++) {
ok = 1;
end:
for (i = 0; i < DB_NUMBER; i++) {
- if (row[i] != NULL)
- OPENSSL_free(row[i]);
+ OPENSSL_free(row[i]);
}
return (ok);
}
}
return (ok);
}
@@
-2312,11
+2279,7
@@
static int get_certificate_status(const char *serial, CA_DB *db)
row[i] = NULL;
/* Malloc needed char spaces */
row[i] = NULL;
/* Malloc needed char spaces */
- row[DB_serial] = OPENSSL_malloc(strlen(serial) + 2);
- if (row[DB_serial] == NULL) {
- BIO_printf(bio_err, "Malloc failure\n");
- goto end;
- }
+ row[DB_serial] = app_malloc(strlen(serial) + 2, "row serial#");
if (strlen(serial) % 2) {
/*
if (strlen(serial) % 2) {
/*
@@
-2368,8
+2331,7
@@
static int get_certificate_status(const char *serial, CA_DB *db)
}
end:
for (i = 0; i < DB_NUMBER; i++) {
}
end:
for (i = 0; i < DB_NUMBER; i++) {
- if (row[i] != NULL)
- OPENSSL_free(row[i]);
+ OPENSSL_free(row[i]);
}
return (ok);
}
}
return (ok);
}
@@
-2385,11
+2347,7
@@
static int do_updatedb(CA_DB *db)
/* get actual time and make a string */
a_tm = X509_gmtime_adj(a_tm, 0);
/* get actual time and make a string */
a_tm = X509_gmtime_adj(a_tm, 0);
- a_tm_s = OPENSSL_malloc(a_tm->length + 1);
- if (a_tm_s == NULL) {
- cnt = -1;
- goto end;
- }
+ a_tm_s = (char *)OPENSSL_malloc(a_tm->length + 1);
memcpy(a_tm_s, a_tm->data, a_tm->length);
a_tm_s[a_tm->length] = '\0';
memcpy(a_tm_s, a_tm->data, a_tm->length);
a_tm_s[a_tm->length] = '\0';
@@
-2429,11
+2387,8
@@
static int do_updatedb(CA_DB *db)
}
}
}
}
- end:
-
ASN1_UTCTIME_free(a_tm);
OPENSSL_free(a_tm_s);
ASN1_UTCTIME_free(a_tm);
OPENSSL_free(a_tm_s);
-
return (cnt);
}
return (cnt);
}
@@
-2453,7
+2408,7
@@
static const char *crl_reasons[] = {
"CAkeyTime"
};
"CAkeyTime"
};
-#define NUM_REASONS
(sizeof(crl_reasons) / sizeof(char *)
)
+#define NUM_REASONS
OSSL_NELEM(crl_reasons
)
/*
* Given revocation information convert to a DB string. The format of the
/*
* Given revocation information convert to a DB string. The format of the
@@
-2533,11
+2488,7
@@
char *make_revocation_str(int rev_type, char *rev_arg)
if (other)
i += strlen(other) + 1;
if (other)
i += strlen(other) + 1;
- str = OPENSSL_malloc(i);
-
- if (!str)
- return NULL;
-
+ str = app_malloc(i, "revocation reason");
BUF_strlcpy(str, (char *)revtm->data, i);
if (reason) {
BUF_strlcat(str, ",", i);
BUF_strlcpy(str, (char *)revtm->data, i);
if (reason) {
BUF_strlcat(str, ",", i);
@@
-2604,8
+2555,7
@@
int make_revoked(X509_REVOKED *rev, const char *str)
end:
end:
- if (tmp)
- OPENSSL_free(tmp);
+ OPENSSL_free(tmp);
ASN1_OBJECT_free(hold);
ASN1_GENERALIZEDTIME_free(comp_time);
ASN1_ENUMERATED_free(rtmp);
ASN1_OBJECT_free(hold);
ASN1_GENERALIZEDTIME_free(comp_time);
ASN1_ENUMERATED_free(rtmp);
@@
-2759,8
+2709,7
@@
int unpack_revinfo(ASN1_TIME **prevtm, int *preason, ASN1_OBJECT **phold,
end:
end:
- if (tmp)
- OPENSSL_free(tmp);
+ OPENSSL_free(tmp);
ASN1_GENERALIZEDTIME_free(comp_time);
return ret;
ASN1_GENERALIZEDTIME_free(comp_time);
return ret;