const fixes
This commit is contained in:
parent
0e304b7f41
commit
ff990440ee
@ -1979,7 +1979,7 @@ void free_index(CA_DB *db)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
int parse_yesno(char *str, int def)
|
int parse_yesno(const char *str, int def)
|
||||||
{
|
{
|
||||||
int ret = def;
|
int ret = def;
|
||||||
if (str)
|
if (str)
|
||||||
|
@ -314,7 +314,7 @@ int save_index(const char *dbfile, const char *suffix, CA_DB *db);
|
|||||||
int rotate_index(const char *dbfile, const char *new_suffix, const char *old_suffix);
|
int rotate_index(const char *dbfile, const char *new_suffix, const char *old_suffix);
|
||||||
void free_index(CA_DB *db);
|
void free_index(CA_DB *db);
|
||||||
int index_name_cmp(const char **a, const char **b);
|
int index_name_cmp(const char **a, const char **b);
|
||||||
int parse_yesno(char *str, int def);
|
int parse_yesno(const char *str, int def);
|
||||||
|
|
||||||
X509_NAME *parse_name(char *str, long chtype, int multirdn);
|
X509_NAME *parse_name(char *str, long chtype, int multirdn);
|
||||||
int args_verify(char ***pargs, int *pargc,
|
int args_verify(char ***pargs, int *pargc,
|
||||||
|
10
apps/ca.c
10
apps/ca.c
@ -300,8 +300,8 @@ int MAIN(int argc, char **argv)
|
|||||||
X509_REVOKED *r=NULL;
|
X509_REVOKED *r=NULL;
|
||||||
ASN1_TIME *tmptm;
|
ASN1_TIME *tmptm;
|
||||||
ASN1_INTEGER *tmpser;
|
ASN1_INTEGER *tmpser;
|
||||||
char *p,*f;
|
char *f;
|
||||||
const char **pp;
|
const char *p, **pp;
|
||||||
int i,j;
|
int i,j;
|
||||||
const EVP_MD *dgst=NULL;
|
const EVP_MD *dgst=NULL;
|
||||||
STACK_OF(CONF_VALUE) *attribs=NULL;
|
STACK_OF(CONF_VALUE) *attribs=NULL;
|
||||||
@ -871,7 +871,7 @@ bad:
|
|||||||
BIO_printf(bio_err," in entry %d\n", i+1);
|
BIO_printf(bio_err," in entry %d\n", i+1);
|
||||||
goto err;
|
goto err;
|
||||||
}
|
}
|
||||||
if (!check_time_format(pp[DB_exp_date]))
|
if (!check_time_format((char *)pp[DB_exp_date]))
|
||||||
{
|
{
|
||||||
BIO_printf(bio_err,"entry %d: invalid expiry date\n",i+1);
|
BIO_printf(bio_err,"entry %d: invalid expiry date\n",i+1);
|
||||||
goto err;
|
goto err;
|
||||||
@ -1252,7 +1252,7 @@ bad:
|
|||||||
x=sk_X509_value(cert_sk,i);
|
x=sk_X509_value(cert_sk,i);
|
||||||
|
|
||||||
j=x->cert_info->serialNumber->length;
|
j=x->cert_info->serialNumber->length;
|
||||||
p=(char *)x->cert_info->serialNumber->data;
|
p=(const char *)x->cert_info->serialNumber->data;
|
||||||
|
|
||||||
if(strlen(outdir) >= (size_t)(j ? BSIZE-j*2-6 : BSIZE-8))
|
if(strlen(outdir) >= (size_t)(j ? BSIZE-j*2-6 : BSIZE-8))
|
||||||
{
|
{
|
||||||
@ -1373,7 +1373,7 @@ bad:
|
|||||||
|
|
||||||
for (i=0; i<sk_num(db->db->data); i++)
|
for (i=0; i<sk_num(db->db->data); i++)
|
||||||
{
|
{
|
||||||
pp=(char **)sk_value(db->db->data,i);
|
pp=(const char **)sk_value(db->db->data,i);
|
||||||
if (pp[DB_type][0] == DB_TYPE_REV)
|
if (pp[DB_type][0] == DB_TYPE_REV)
|
||||||
{
|
{
|
||||||
if ((r=X509_REVOKED_new()) == NULL) goto err;
|
if ((r=X509_REVOKED_new()) == NULL) goto err;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user