projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update copyright year
[openssl.git]
/
apps
/
ca.c
diff --git
a/apps/ca.c
b/apps/ca.c
index 48f7cd197387a65f9e289a34332bc0545f372d2a..69207c0662ed7f16f5c1f87f52ac80bf58a0c099 100644
(file)
--- a/
apps/ca.c
+++ b/
apps/ca.c
@@
-605,7
+605,7
@@
end_of_options:
/*
* outdir is a directory spec, but access() for VMS demands a
* filename. We could use the DEC C routine to convert the
/*
* outdir is a directory spec, but access() for VMS demands a
* filename. We could use the DEC C routine to convert the
- * directory syntax to Unix
ly
, and give that to app_isdir,
+ * directory syntax to Unix, and give that to app_isdir,
* but for now the fopen will catch the error if it's not a
* directory
*/
* but for now the fopen will catch the error if it's not a
* directory
*/
@@
-976,7
+976,7
@@
end_of_options:
BIO_printf(bio_err, "Write out database with %d new entries\n",
sk_X509_num(cert_sk));
BIO_printf(bio_err, "Write out database with %d new entries\n",
sk_X509_num(cert_sk));
- if (
!rand_ser
+ if (
serialfile != NULL
&& !save_serial(serialfile, "new", serial, NULL))
goto end;
&& !save_serial(serialfile, "new", serial, NULL))
goto end;
@@
-1044,7
+1044,8
@@
end_of_options:
if (sk_X509_num(cert_sk)) {
/* Rename the database and the serial file */
if (sk_X509_num(cert_sk)) {
/* Rename the database and the serial file */
- if (!rotate_serial(serialfile, "new", "old"))
+ if (serialfile != NULL
+ && !rotate_serial(serialfile, "new", "old"))
goto end;
if (!rotate_index(dbfile, "new", "old"))
goto end;
if (!rotate_index(dbfile, "new", "old"))
@@
-1177,10
+1178,9
@@
end_of_options:
}
/* we have a CRL number that need updating */
}
/* we have a CRL number that need updating */
- if (crlnumberfile != NULL)
- if (!rand_ser
- && !save_serial(crlnumberfile, "new", crlnumber, NULL))
- goto end;
+ if (crlnumberfile != NULL
+ && !save_serial(crlnumberfile, "new", crlnumber, NULL))
+ goto end;
BN_free(crlnumber);
crlnumber = NULL;
BN_free(crlnumber);
crlnumber = NULL;
@@
-1195,9
+1195,10
@@
end_of_options:
PEM_write_bio_X509_CRL(Sout, crl);
PEM_write_bio_X509_CRL(Sout, crl);
- if (crlnumberfile != NULL) /* Rename the crlnumber file */
- if (!rotate_serial(crlnumberfile, "new", "old"))
- goto end;
+ /* Rename the crlnumber file */
+ if (crlnumberfile != NULL
+ && !rotate_serial(crlnumberfile, "new", "old"))
+ goto end;
}
/*****************************************************************/
}
/*****************************************************************/