summaryrefslogtreecommitdiffstats
path: root/apps/s_client.c
diff options
context:
space:
mode:
authorFdaSilvaYY <fdasilvayy@gmail.com>2016-08-03 22:49:25 +0200
committerMatt Caswell <matt@openssl.org>2016-08-17 17:09:19 +0100
commit54463e4f332ab1fd669411db2f37f9cb70651e89 (patch)
treed580094aa90fa1689bef10c13f1abf2ed4e84651 /apps/s_client.c
parent2e5ead831b1a92d78113b00978f8b3323268469f (diff)
Relocalise some globals variables
Reviewed-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org>
Diffstat (limited to 'apps/s_client.c')
-rw-r--r--apps/s_client.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/apps/s_client.c b/apps/s_client.c
index 46fa87bcf9..6cd01ed9e6 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -84,19 +84,12 @@ typedef unsigned int u_int;
#define S_CLIENT_IRC_READ_TIMEOUT 8
static char *prog;
-static int c_nbio = 0;
-static int c_tlsextdebug = 0;
-static int c_status_req = 0;
static int c_debug = 0;
-static int c_msg = 0;
static int c_showcerts = 0;
static char *keymatexportlabel = NULL;
static int keymatexportlen = 20;
static BIO *bio_c_out = NULL;
-static BIO *bio_c_msg = NULL;
static int c_quiet = 0;
-static int c_ign_eof = 0;
-static int c_brief = 0;
static void print_stuff(BIO *berr, SSL *con, int full);
#ifndef OPENSSL_NO_OCSP
@@ -856,6 +849,9 @@ int s_client_main(int argc, char **argv)
unsigned int max_pipelines = 0;
enum { use_inet, use_unix, use_unknown } connect_type = use_unknown;
int count4or6 = 0;
+ int c_nbio = 0, c_msg = 0, c_ign_eof = 0, c_brief = 0;
+ int c_tlsextdebug = 0, c_status_req = 0;
+ BIO *bio_c_msg = NULL;
FD_ZERO(&readfds);
FD_ZERO(&writefds);
@@ -869,9 +865,7 @@ int s_client_main(int argc, char **argv)
prog = opt_progname(argv[0]);
c_quiet = 0;
- c_ign_eof = 0;
c_debug = 0;
- c_msg = 0;
c_showcerts = 0;
c_nbio = 0;
vpm = X509_VERIFY_PARAM_new();