Commit cc696296 authored by FdaSilvaYY's avatar FdaSilvaYY Committed by Matt Caswell
Browse files

Constify char* input parameters in apps code 



Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
parent e7917e38

apps/apps.c

+9 −8
Original line number Diff line number Diff line
@@ -320,9 +320,9 @@ int password_callback(char *buf, int bufsiz, int verify, PW_CB_DATA *cb_tmp) 
    return res;

}



static char *app_get_pass(char *arg, int keepbio);

static char *app_get_pass(const char *arg, int keepbio);



int app_passwd(char *arg1, char *arg2, char **pass1, char **pass2)

int app_passwd(const char *arg1, const char *arg2, char **pass1, char **pass2)

{

    int same;

    if (!arg2 || !arg1 || strcmp(arg1, arg2))
@@ -344,7 +344,7 @@ int app_passwd(char *arg1, char *arg2, char **pass1, char **pass2) 
    return 1;

}



static char *app_get_pass(char *arg, int keepbio)

static char *app_get_pass(const char *arg, int keepbio)

{

    char *tmp, tpass[APP_PASS_LEN];

    static BIO *pwdbio = NULL;
@@ -1185,7 +1185,7 @@ void print_array(BIO *out, const char* title, int len, const unsigned char* d) 
    BIO_printf(out, "\n};\n");

}



X509_STORE *setup_verify(char *CAfile, char *CApath, int noCAfile, int noCApath)

X509_STORE *setup_verify(const char *CAfile, const char *CApath, int noCAfile, int noCApath)

{

    X509_STORE *store = X509_STORE_new();

    X509_LOOKUP *lookup;
@@ -1318,7 +1318,7 @@ static IMPLEMENT_LHASH_HASH_FN(index_name, OPENSSL_CSTRING) 
static IMPLEMENT_LHASH_COMP_FN(index_name, OPENSSL_CSTRING)

#undef BSIZE

#define BSIZE 256

BIGNUM *load_serial(char *serialfile, int create, ASN1_INTEGER **retai)

BIGNUM *load_serial(const char *serialfile, int create, ASN1_INTEGER **retai)

{

    BIO *in = NULL;

    BIGNUM *ret = NULL;
@@ -1363,7 +1363,7 @@ BIGNUM *load_serial(char *serialfile, int create, ASN1_INTEGER **retai) 
    return (ret);

}



int save_serial(char *serialfile, char *suffix, BIGNUM *serial,

int save_serial(const char *serialfile, const char *suffix, const BIGNUM *serial,

                ASN1_INTEGER **retai)

{

    char buf[1][BSIZE];
@@ -1413,7 +1413,8 @@ int save_serial(char *serialfile, char *suffix, BIGNUM *serial, 
    return (ret);

}



int rotate_serial(char *serialfile, char *new_suffix, char *old_suffix)

int rotate_serial(const char *serialfile, const char *new_suffix,

                  const char *old_suffix)

{

    char buf[2][BSIZE];

    int i, j;
@@ -1483,7 +1484,7 @@ int rand_serial(BIGNUM *b, ASN1_INTEGER *ai) 
    return ret;

}



CA_DB *load_index(char *dbfile, DB_ATTR *db_attr)

CA_DB *load_index(const char *dbfile, DB_ATTR *db_attr)

{

    CA_DB *retdb = NULL;

    TXT_DB *tmpdb = NULL;

apps/apps.h

+7 −6
Original line number Diff line number Diff line
@@ -400,7 +400,7 @@ int set_cert_ex(unsigned long *flags, const char *arg); 
int set_name_ex(unsigned long *flags, const char *arg);

int set_ext_copy(int *copy_type, const char *arg);

int copy_extensions(X509 *x, X509_REQ *req, int copy_type);

int app_passwd(char *arg1, char *arg2, char **pass1, char **pass2);

int app_passwd(const char *arg1, const char *arg2, char **pass1, char **pass2);

int add_oid_section(CONF *conf);

X509 *load_cert(const char *file, int format, const char *cert_descrip);

X509_CRL *load_crl(const char *infile, int format);
@@ -412,7 +412,7 @@ int load_certs(const char *file, STACK_OF(X509) **certs, int format, 
               const char *pass, const char *cert_descrip);

int load_crls(const char *file, STACK_OF(X509_CRL) **crls, int format,

              const char *pass, const char *cert_descrip);

X509_STORE *setup_verify(char *CAfile, char *CApath,

X509_STORE *setup_verify(const char *CAfile, const char *CApath,

                         int noCAfile, int noCApath);

__owur int ctx_set_verify_locations(SSL_CTX *ctx, const char *CAfile,

                                    const char *CApath, int noCAfile,
@@ -468,12 +468,13 @@ typedef struct ca_db_st { 
} CA_DB;



void* app_malloc(int sz, const char *what);

BIGNUM *load_serial(char *serialfile, int create, ASN1_INTEGER **retai);

int save_serial(char *serialfile, char *suffix, BIGNUM *serial,

BIGNUM *load_serial(const char *serialfile, int create, ASN1_INTEGER **retai);

int save_serial(const char *serialfile, const char *suffix, const BIGNUM *serial,

                ASN1_INTEGER **retai);

int rotate_serial(char *serialfile, char *new_suffix, char *old_suffix);

int rotate_serial(const char *serialfile, const char *new_suffix,

                  const char *old_suffix);

int rand_serial(BIGNUM *b, ASN1_INTEGER *ai);

CA_DB *load_index(char *dbfile, DB_ATTR *dbattr);

CA_DB *load_index(const char *dbfile, DB_ATTR *dbattr);

int index_index(CA_DB *db);

int save_index(const char *dbfile, const char *suffix, CA_DB *db);

int rotate_index(const char *dbfile, const char *new_suffix,

apps/asn1pars.c

+2 −2
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ OPTIONS asn1parse_options[] = { 
    {NULL}

};



static int do_generate(char *genstr, char *genconf, BUF_MEM *buf);

static int do_generate(char *genstr, const char *genconf, BUF_MEM *buf);



int asn1parse_main(int argc, char **argv)

{
@@ -283,7 +283,7 @@ int asn1parse_main(int argc, char **argv) 
    return (ret);

}



static int do_generate(char *genstr, char *genconf, BUF_MEM *buf)

static int do_generate(char *genstr, const char *genconf, BUF_MEM *buf)

{

    CONF *cnf = NULL;

    int len;

apps/ca.c

+45 −40
Original line number Diff line number Diff line
@@ -90,39 +90,40 @@ 
#define REV_CA_COMPROMISE       4 /* Value is CA key compromise time */



static char *lookup_conf(const CONF *conf, const char *group, const char *tag);

static int certify(X509 **xret, char *infile, EVP_PKEY *pkey, X509 *x509,



static int certify(X509 **xret, const char *infile, EVP_PKEY *pkey, X509 *x509,

                   const EVP_MD *dgst, STACK_OF(OPENSSL_STRING) *sigopts,

                   STACK_OF(CONF_VALUE) *policy, CA_DB *db,

                   BIGNUM *serial, char *subj, unsigned long chtype,

                   int multirdn, int email_dn, char *startdate, char *enddate,

                   long days, int batch, char *ext_sect, CONF *conf,

                   BIGNUM *serial, const char *subj, unsigned long chtype,

                   int multirdn, int email_dn, const char *startdate,

                   const char *enddate,

                   long days, int batch, const char *ext_sect, CONF *conf,

                   int verbose, unsigned long certopt, unsigned long nameopt,

                   int default_op, int ext_copy, int selfsign);

static int certify_cert(X509 **xret, char *infile, EVP_PKEY *pkey, X509 *x509,

static int certify_cert(X509 **xret, const char *infile, EVP_PKEY *pkey, X509 *x509,

                        const EVP_MD *dgst, STACK_OF(OPENSSL_STRING) *sigopts,

                        STACK_OF(CONF_VALUE) *policy, CA_DB *db,

                        BIGNUM *serial, char *subj, unsigned long chtype,

                        int multirdn, int email_dn, char *startdate,

                        char *enddate, long days, int batch, char *ext_sect,

                        BIGNUM *serial, const char *subj, unsigned long chtype,

                        int multirdn, int email_dn, const char *startdate,

                        const char *enddate, long days, int batch, const char *ext_sect,

                        CONF *conf, int verbose, unsigned long certopt,

                        unsigned long nameopt, int default_op, int ext_copy);

static int certify_spkac(X509 **xret, char *infile, EVP_PKEY *pkey,

static int certify_spkac(X509 **xret, const char *infile, EVP_PKEY *pkey,

                         X509 *x509, const EVP_MD *dgst,

                         STACK_OF(OPENSSL_STRING) *sigopts,

                         STACK_OF(CONF_VALUE) *policy, CA_DB *db,

                         BIGNUM *serial, char *subj, unsigned long chtype,

                         int multirdn, int email_dn, char *startdate,

                         char *enddate, long days, char *ext_sect, CONF *conf,

                         BIGNUM *serial, const char *subj, unsigned long chtype,

                         int multirdn, int email_dn, const char *startdate,

                         const char *enddate, long days, const char *ext_sect, CONF *conf,

                         int verbose, unsigned long certopt,

                         unsigned long nameopt, int default_op, int ext_copy);

static void write_new_certificate(BIO *bp, X509 *x, int output_der,

                                  int notext);

static void write_new_certificate(BIO *bp, X509 *x, int output_der, int notext);

static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509,

                   const EVP_MD *dgst, STACK_OF(OPENSSL_STRING) *sigopts,

                   STACK_OF(CONF_VALUE) *policy, CA_DB *db, BIGNUM *serial,

                   char *subj, unsigned long chtype, int multirdn,

                   int email_dn, char *startdate, char *enddate, long days,

                   int batch, int verbose, X509_REQ *req, char *ext_sect,

                   const char *subj, unsigned long chtype, int multirdn,

                   int email_dn, const char *startdate, const char *enddate, long days,

                   int batch, int verbose, X509_REQ *req, const char *ext_sect,

                   CONF *conf, unsigned long certopt, unsigned long nameopt,

                   int default_op, int ext_copy, int selfsign);

static int do_revoke(X509 *x509, CA_DB *db, int ext, char *extval);
@@ -235,12 +236,12 @@ int ca_main(int argc, char **argv) 
    const EVP_MD *dgst = NULL;

    char *configfile = default_config_file, *section = NULL;

    char *md = NULL, *policy = NULL, *keyfile = NULL;

    char *certfile = NULL, *crl_ext = NULL, *crlnumberfile = NULL;

    char *infile = NULL, *spkac_file = NULL, *ss_cert_file = NULL;

    char *extensions = NULL, *extfile = NULL, *key = NULL, *passinarg = NULL;

    char *certfile = NULL, *crl_ext = NULL, *crlnumberfile = NULL, *key = NULL;

    const char *infile = NULL, *spkac_file = NULL, *ss_cert_file = NULL;

    const char *extensions = NULL, *extfile = NULL, *passinarg = NULL;

    char *outdir = NULL, *outfile = NULL, *rev_arg = NULL, *ser_status = NULL;

    char *serialfile = NULL, *startdate = NULL, *subj = NULL;

    char *prog, *enddate = NULL;

    const char *serialfile = NULL, *subj = NULL;

    char *prog, *startdate = NULL, *enddate = NULL;

    char *dbfile = NULL, *f, *randfile = NULL;

    char buf[3][BSIZE];

    char *const *pp;
@@ -1245,12 +1246,13 @@ static char *lookup_conf(const CONF *conf, const char *section, const char *tag) 
    return entry;

}



static int certify(X509 **xret, char *infile, EVP_PKEY *pkey, X509 *x509,

static int certify(X509 **xret, const char *infile, EVP_PKEY *pkey, X509 *x509,

                   const EVP_MD *dgst, STACK_OF(OPENSSL_STRING) *sigopts,

                   STACK_OF(CONF_VALUE) *policy, CA_DB *db,

                   BIGNUM *serial, char *subj, unsigned long chtype,

                   int multirdn, int email_dn, char *startdate, char *enddate,

                   long days, int batch, char *ext_sect, CONF *lconf,

                   BIGNUM *serial, const char *subj, unsigned long chtype,

                   int multirdn, int email_dn, const char *startdate,

                   const char *enddate,

                   long days, int batch, const char *ext_sect, CONF *lconf,

                   int verbose, unsigned long certopt, unsigned long nameopt,

                   int default_op, int ext_copy, int selfsign)

{
@@ -1312,12 +1314,12 @@ static int certify(X509 **xret, char *infile, EVP_PKEY *pkey, X509 *x509, 
    return (ok);

}



static int certify_cert(X509 **xret, char *infile, EVP_PKEY *pkey, X509 *x509,

static int certify_cert(X509 **xret, const char *infile, EVP_PKEY *pkey, X509 *x509,

                        const EVP_MD *dgst, STACK_OF(OPENSSL_STRING) *sigopts,

                        STACK_OF(CONF_VALUE) *policy, CA_DB *db,

                        BIGNUM *serial, char *subj, unsigned long chtype,

                        int multirdn, int email_dn, char *startdate,

                        char *enddate, long days, int batch, char *ext_sect,

                        BIGNUM *serial, const char *subj, unsigned long chtype,

                        int multirdn, int email_dn, const char *startdate,

                        const char *enddate, long days, int batch, const char *ext_sect,

                        CONF *lconf, int verbose, unsigned long certopt,

                        unsigned long nameopt, int default_op, int ext_copy)

{
@@ -1367,9 +1369,9 @@ static int certify_cert(X509 **xret, char *infile, EVP_PKEY *pkey, X509 *x509, 
static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509,

                   const EVP_MD *dgst, STACK_OF(OPENSSL_STRING) *sigopts,

                   STACK_OF(CONF_VALUE) *policy, CA_DB *db, BIGNUM *serial,

                   char *subj, unsigned long chtype, int multirdn,

                   int email_dn, char *startdate, char *enddate, long days,

                   int batch, int verbose, X509_REQ *req, char *ext_sect,

                   const char *subj, unsigned long chtype, int multirdn,

                   int email_dn, const char *startdate, const char *enddate, long days,

                   int batch, int verbose, X509_REQ *req, const char *ext_sect,

                   CONF *lconf, unsigned long certopt, unsigned long nameopt,

                   int default_op, int ext_copy, int selfsign)

{
@@ -1880,13 +1882,13 @@ static void write_new_certificate(BIO *bp, X509 *x, int output_der, 
    PEM_write_bio_X509(bp, x);

}



static int certify_spkac(X509 **xret, char *infile, EVP_PKEY *pkey,

static int certify_spkac(X509 **xret, const char *infile, EVP_PKEY *pkey,

                         X509 *x509, const EVP_MD *dgst,

                         STACK_OF(OPENSSL_STRING) *sigopts,

                         STACK_OF(CONF_VALUE) *policy, CA_DB *db,

                         BIGNUM *serial, char *subj, unsigned long chtype,

                         int multirdn, int email_dn, char *startdate,

                         char *enddate, long days, char *ext_sect,

                         BIGNUM *serial, const char *subj, unsigned long chtype,

                         int multirdn, int email_dn, const char *startdate,

                         const char *enddate, long days, const char *ext_sect,

                         CONF *lconf, int verbose, unsigned long certopt,

                         unsigned long nameopt, int default_op, int ext_copy)

{
@@ -2268,7 +2270,8 @@ static const char *crl_reasons[] = { 


char *make_revocation_str(int rev_type, char *rev_arg)

{

    char *other = NULL, *str;

    char *str;

    const char *other = NULL;

    const char *reason = NULL;

    ASN1_OBJECT *otmp;

    ASN1_UTCTIME *revtm = NULL;
@@ -2415,8 +2418,10 @@ int make_revoked(X509_REVOKED *rev, const char *str) 


static int old_entry_print(const ASN1_OBJECT *obj, const ASN1_STRING *str)

{

    char buf[25], *pbuf, *p;

    char buf[25], *pbuf;

    const char *p;

    int j;



    j = i2a_ASN1_OBJECT(bio_err, obj);

    pbuf = buf;

    for (j = 22 - j; j > 0; j--)
@@ -2436,7 +2441,7 @@ static int old_entry_print(const ASN1_OBJECT *obj, const ASN1_STRING *str) 
    else

        BIO_printf(bio_err, "ASN.1 %2d:'", str->type);



    p = (char *)str->data;

    p = (const char *)str->data;

    for (j = str->length; j > 0; j--) {

        if ((*p >= ' ') && (*p <= '~'))

            BIO_printf(bio_err, "%c", *p);

apps/cms.c

+2 −1
Original line number Diff line number Diff line
@@ -199,7 +199,8 @@ int cms_main(int argc, char **argv) 
    X509_STORE *store = NULL;

    X509_VERIFY_PARAM *vpm = NULL;

    char *certfile = NULL, *keyfile = NULL, *contfile = NULL;

    char *CAfile = NULL, *CApath = NULL, *certsoutfile = NULL;

    const char *CAfile = NULL, *CApath = NULL;

    char *certsoutfile = NULL;

    int noCAfile = 0, noCApath = 0;

    char *infile = NULL, *outfile = NULL, *rctfile = NULL, *inrand = NULL;

    char *passinarg = NULL, *passin = NULL, *signerfile = NULL, *recipfile =