const fixes

diff --git a/apps/apps.c b/apps/apps.c
index b8d1c5f4b2591bad60cb32dd3c8d402b34b4fd08..988bb6e9417aae79e58eef7f7ccc47d42a619fb4 100644 (file)
--- a/apps/apps.c
+++ b/apps/apps.c
@@ -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;
        if (str)

diff --git a/apps/apps.h b/apps/apps.h
index 21544fde439e1fbfe96160da28c9af6b70e00283..b9bb91c1862565da61dfedc9842b835d65c1fe29 100644 (file)
--- a/apps/apps.h
+++ b/apps/apps.h
@@ -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);
 void free_index(CA_DB *db);
 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);
 int args_verify(char ***pargs, int *pargc,

diff --git a/apps/ca.c b/apps/ca.c
index dafa93b3ebd6d92dc7f66e961f80cba22ec12e3a..987b4d83f64ee2db5fb6eb26e354b09eec59d4cb 100644 (file)
--- a/apps/ca.c
+++ b/apps/ca.c
@@ -300,8 +300,8 @@ int MAIN(int argc, char **argv)
        X509_REVOKED *r=NULL;
        ASN1_TIME *tmptm;
        ASN1_INTEGER *tmpser;
-       char *p,*f;
-       const char **pp;
+       char *f;
+       const char *p, **pp;
        int i,j;
        const EVP_MD *dgst=NULL;
        STACK_OF(CONF_VALUE) *attribs=NULL;
@@ -871,7 +871,7 @@ bad:
                        BIO_printf(bio_err," in entry %d\n", i+1);
                        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);
                        goto err;
@@ -1252,7 +1252,7 @@ bad:
                        x=sk_X509_value(cert_sk,i);
 
                        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))
                                {
@@ -1373,7 +1373,7 @@ bad:
 
                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 ((r=X509_REVOKED_new()) == NULL) goto err;