Commit a773b52a authored by Rich Salz's avatar Rich Salz Committed by Rich Salz
Browse files

Remove unused parameters from internal functions 



Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent 5de75fb4

Configure

+3 −3
Original line number Diff line number Diff line
@@ -94,11 +94,11 @@ my $gcc_devteam_warn = "-DPEDANTIC -DREF_DEBUG -DDEBUG_UNUSED -DBIO_DEBUG" 
# TODO(openssl-team): fix problems and investigate if (at least) the

# following warnings can also be enabled:

#       -Wswitch-enum

#       -Wunused-macros

#       -Wcast-align

#       -Wunreachable-code

#       -Wlanguage-extension-token

#       -Wextended-offsetof

#       -Wlanguage-extension-token -- no, we use asm()

#       -Wunused-macros -- no, too tricky for BN and _XOPEN_SOURCE etc

#       -Wextended-offsetof -- no, needed in CMS ASN1 code

my $clang_devteam_warn = ""

        . " -Qunused-arguments"

        . " -Wextra"

apps/apps.c

+8 −9
Original line number Diff line number Diff line
@@ -674,8 +674,7 @@ int load_cert_crl_http(const char *url, X509 **pcert, X509_CRL **pcrl) 
    return rv;

}



X509 *load_cert(const char *file, int format,

                const char *pass, ENGINE *e, const char *cert_descrip)

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

{

    X509 *x = NULL;

    BIO *cert;
@@ -904,7 +903,7 @@ EVP_PKEY *load_pubkey(const char *file, int format, int maybe_stdin, 
}



static int load_certs_crls(const char *file, int format,

                           const char *pass, ENGINE *e, const char *desc,

                           const char *pass, const char *desc,

                           STACK_OF(X509) **pcerts,

                           STACK_OF(X509_CRL) **pcrls)

{
@@ -1002,18 +1001,18 @@ void* app_malloc(int sz, const char *what) 
 * Initialize or extend, if *certs != NULL,  a certificate stack.

 */

int load_certs(const char *file, STACK_OF(X509) **certs, int format,

               const char *pass, ENGINE *e, const char *desc)

               const char *pass, const char *desc)

{

    return load_certs_crls(file, format, pass, e, desc, certs, NULL);

    return load_certs_crls(file, format, pass, desc, certs, NULL);

}



/*

 * Initialize or extend, if *crls != NULL,  a certificate stack.

 */

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

              const char *pass, ENGINE *e, const char *desc)

              const char *pass, const char *desc)

{

    return load_certs_crls(file, format, pass, e, desc, NULL, crls);

    return load_certs_crls(file, format, pass, desc, NULL, crls);

}



#define X509V3_EXT_UNKNOWN_MASK         (0xfL << 16)
@@ -1300,7 +1299,7 @@ X509_STORE *setup_verify(char *CAfile, char *CApath, int noCAfile, int noCApath) 


#ifndef OPENSSL_NO_ENGINE

/* Try to load an engine in a shareable library */

static ENGINE *try_load_engine(const char *engine, int debug)

static ENGINE *try_load_engine(const char *engine)

{

    ENGINE *e = ENGINE_by_id("dynamic");

    if (e) {
@@ -1324,7 +1323,7 @@ ENGINE *setup_engine(const char *engine, int debug) 
            return NULL;

        }

        if ((e = ENGINE_by_id(engine)) == NULL

            && (e = try_load_engine(engine, debug)) == NULL) {

            && (e = try_load_engine(engine)) == NULL) {

            BIO_printf(bio_err, "invalid engine \"%s\"\n", engine);

            ERR_print_errors(bio_err);

            return NULL;

apps/apps.h

+3 −4
Original line number Diff line number Diff line
@@ -475,8 +475,7 @@ 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 add_oid_section(CONF *conf);

X509 *load_cert(const char *file, int format,

                const char *pass, ENGINE *e, const char *cert_descrip);

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

X509_CRL *load_crl(const char *infile, int format);

int load_cert_crl_http(const char *url, X509 **pcert, X509_CRL **pcrl);

EVP_PKEY *load_key(const char *file, int format, int maybe_stdin,
@@ -484,9 +483,9 @@ EVP_PKEY *load_key(const char *file, int format, int maybe_stdin, 
EVP_PKEY *load_pubkey(const char *file, int format, int maybe_stdin,

                      const char *pass, ENGINE *e, const char *key_descrip);

int load_certs(const char *file, STACK_OF(X509) **certs, int format,

               const char *pass, ENGINE *e, const char *cert_descrip);

               const char *pass, const char *cert_descrip);

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

              const char *pass, ENGINE *e, const char *cert_descrip);

              const char *pass, const char *cert_descrip);

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

                         int noCAfile, int noCApath);

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

apps/ca.c

+6 −8
Original line number Diff line number Diff line
@@ -153,8 +153,7 @@ static int certify_cert(X509 **xret, char *infile, EVP_PKEY *pkey, X509 *x509, 
                        int multirdn, int email_dn, char *startdate,

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

                        CONF *conf, int verbose, unsigned long certopt,

                        unsigned long nameopt, int default_op, int ext_copy,

                        ENGINE *e);

                        unsigned long nameopt, int default_op, int ext_copy);

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

                         X509 *x509, const EVP_MD *dgst,

                         STACK_OF(OPENSSL_STRING) *sigopts,
@@ -607,7 +606,7 @@ end_of_options: 
            lookup_fail(section, ENV_CERTIFICATE);

            goto end;

        }

        x509 = load_cert(certfile, FORMAT_PEM, NULL, e, "CA certificate");

        x509 = load_cert(certfile, FORMAT_PEM, "CA certificate");

        if (x509 == NULL)

            goto end;
@@ -964,7 +963,7 @@ end_of_options: 
                             db, serial, subj, chtype, multirdn, email_dn,

                             startdate, enddate, days, batch, extensions,

                             conf, verbose, certopt, nameopt, default_op,

                             ext_copy, e);

                             ext_copy);

            if (j < 0)

                goto end;

            if (j > 0) {
@@ -1265,7 +1264,7 @@ end_of_options: 
            goto end;

        } else {

            X509 *revcert;

            revcert = load_cert(infile, FORMAT_PEM, NULL, e, infile);

            revcert = load_cert(infile, FORMAT_PEM, infile);

            if (revcert == NULL)

                goto end;

            if (dorevoke == 2)
@@ -1391,15 +1390,14 @@ static int certify_cert(X509 **xret, char *infile, EVP_PKEY *pkey, X509 *x509, 
                        int multirdn, int email_dn, char *startdate,

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

                        CONF *lconf, int verbose, unsigned long certopt,

                        unsigned long nameopt, int default_op, int ext_copy,

                        ENGINE *e)

                        unsigned long nameopt, int default_op, int ext_copy)

{

    X509 *req = NULL;

    X509_REQ *rreq = NULL;

    EVP_PKEY *pktmp = NULL;

    int ok = -1, i;



    if ((req = load_cert(infile, FORMAT_PEM, NULL, e, infile)) == NULL)

    if ((req = load_cert(infile, FORMAT_PEM, infile)) == NULL)

        goto end;

    if (verbose)

        X509_print(bio_err, req);

apps/cms.c

+6 −7
Original line number Diff line number Diff line
@@ -550,7 +550,7 @@ int cms_main(int argc, char **argv) 
            if (operation == SMIME_ENCRYPT) {

                if (encerts == NULL && (encerts = sk_X509_new_null()) == NULL)

                    goto end;

                cert = load_cert(opt_arg(), FORMAT_PEM, NULL, e,

                cert = load_cert(opt_arg(), FORMAT_PEM,

                                 "recipient certificate file");

                if (cert == NULL)

                    goto end;
@@ -725,7 +725,7 @@ int cms_main(int argc, char **argv) 
            if ((encerts = sk_X509_new_null()) == NULL)

                goto end;

        while (*argv) {

            if ((cert = load_cert(*argv, FORMAT_PEM, NULL, e,

            if ((cert = load_cert(*argv, FORMAT_PEM,

                                  "recipient certificate file")) == NULL)

                goto end;

            sk_X509_push(encerts, cert);
@@ -735,7 +735,7 @@ int cms_main(int argc, char **argv) 
    }



    if (certfile) {

        if (!load_certs(certfile, &other, FORMAT_PEM, NULL, e,

        if (!load_certs(certfile, &other, FORMAT_PEM, NULL,

                        "certificate file")) {

            ERR_print_errors(bio_err);

            goto end;
@@ -743,7 +743,7 @@ int cms_main(int argc, char **argv) 
    }



    if (recipfile && (operation == SMIME_DECRYPT)) {

        if ((recip = load_cert(recipfile, FORMAT_PEM, NULL, e,

        if ((recip = load_cert(recipfile, FORMAT_PEM,

                               "recipient certificate file")) == NULL) {

            ERR_print_errors(bio_err);

            goto end;
@@ -751,7 +751,7 @@ int cms_main(int argc, char **argv) 
    }



    if (operation == SMIME_SIGN_RECEIPT) {

        if ((signer = load_cert(signerfile, FORMAT_PEM, NULL, e,

        if ((signer = load_cert(signerfile, FORMAT_PEM,

                                "receipt signer certificate file")) == NULL) {

            ERR_print_errors(bio_err);

            goto end;
@@ -968,8 +968,7 @@ int cms_main(int argc, char **argv) 
            signerfile = sk_OPENSSL_STRING_value(sksigners, i);

            keyfile = sk_OPENSSL_STRING_value(skkeys, i);



            signer = load_cert(signerfile, FORMAT_PEM, NULL,

                               e, "signer certificate");

            signer = load_cert(signerfile, FORMAT_PEM, "signer certificate");

            if (!signer)

                goto end;

            key = load_key(keyfile, keyform, 0, passin, e, "signing key file");