From fba13663980f35b013b63372b1d24429e4d1e024 Mon Sep 17 00:00:00 2001 From: FdaSilvaYY Date: Tue, 10 May 2016 23:39:05 +0200 Subject: [PATCH] Locally declare some variables Reviewed-by: Richard Levitte Reviewed-by: Matt Caswell --- apps/ca.c | 5 ++--- apps/s_client.c | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/apps/ca.c b/apps/ca.c index 49e7f52a2a..e8a0713051 100644 --- a/apps/ca.c +++ b/apps/ca.c @@ -133,9 +133,7 @@ char *make_revocation_str(int rev_type, char *rev_arg); int make_revoked(X509_REVOKED *rev, const char *str); static int old_entry_print(ASN1_OBJECT *obj, ASN1_STRING *str); -static CONF *conf = NULL; static CONF *extconf = NULL; -static char *section = NULL; static int preserve = 0; static int msie_hack = 0; @@ -220,6 +218,7 @@ OPTIONS ca_options[] = { int ca_main(int argc, char **argv) { + CONF *conf = NULL; ENGINE *e = NULL; BIGNUM *crlnumber = NULL, *serial = NULL; EVP_PKEY *pkey = NULL; @@ -233,7 +232,7 @@ int ca_main(int argc, char **argv) STACK_OF(X509) *cert_sk = NULL; X509_CRL *crl = NULL; const EVP_MD *dgst = NULL; - char *configfile = default_config_file; + 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; diff --git a/apps/s_client.c b/apps/s_client.c index 01d1036209..d8678c39ef 100644 --- a/apps/s_client.c +++ b/apps/s_client.c @@ -89,9 +89,6 @@ extern int verify_return_error; extern int verify_quiet; static char *prog; -static int async = 0; -static unsigned int split_send_fragment = 0; -static unsigned int max_pipelines = 0; static int c_nbio = 0; static int c_tlsextdebug = 0; static int c_status_req = 0; @@ -841,6 +838,9 @@ int s_client_main(int argc, char **argv) int ct_validation = 0; #endif int min_version = 0, max_version = 0; + int async = 0; + unsigned int split_send_fragment = 0; + unsigned int max_pipelines = 0; FD_ZERO(&readfds); FD_ZERO(&writefds); -- 2.25.1