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

Relocalise some globals variables 



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

apps/s_client.c

+3 −9
Original line number Diff line number Diff line
@@ -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();

apps/s_server.c

+36 −67
Original line number Diff line number Diff line
@@ -43,10 +43,14 @@ 
#include <stdio.h>

#include <stdlib.h>

#include <string.h>

#include <openssl/async.h>

#include <openssl/ssl.h>

#if defined(_WIN32)

/* Included before async.h to avoid some warnings */

# include <windows.h>

#endif



#include <openssl/e_os2.h>

#include <openssl/async.h>

#include <openssl/ssl.h>



#ifndef OPENSSL_NO_SOCK
@@ -101,26 +105,14 @@ static void free_sessions(void); 
static DH *load_dh_param(const char *dhfile);

#endif



static void s_server_init(void);



/* static int load_CA(SSL_CTX *ctx, char *file);*/



#undef BUFSIZZ

#define BUFSIZZ 16*1024

static int bufsize = BUFSIZZ;

static const int bufsize = 16*1024;

static int accept_socket = -1;



#define TEST_CERT       "server.pem"

#define TEST_CERT2      "server2.pem"





static int s_server_verify = SSL_VERIFY_NONE;

static int s_server_session_id_context = 1; /* anything will do */

static const char *s_cert_file = TEST_CERT, *s_key_file =

    NULL, *s_chain_file = NULL;



static const char *s_cert_file2 = TEST_CERT2, *s_key_file2 = NULL;

static char *s_dcert_file = NULL, *s_dkey_file = NULL, *s_dchain_file = NULL;

static int s_nbio = 0;

static int s_nbio_test = 0;

static int s_crlf = 0;
@@ -132,8 +124,6 @@ static BIO *bio_s_out = NULL; 
static BIO *bio_s_msg = NULL;

static int s_debug = 0;

static int s_tlsextdebug = 0;

static int s_tlsextstatus = 0;

static int no_resume_ephemeral = 0;

static int s_msg = 0;

static int s_quiet = 0;

static int s_ign_eof = 0;
@@ -143,8 +133,6 @@ static char *keymatexportlabel = NULL; 
static int keymatexportlen = 20;



static int async = 0;

static unsigned int split_send_fragment = 0;

static unsigned int max_pipelines = 0;



static const char *session_id_prefix = NULL;
@@ -155,8 +143,6 @@ static long socket_mtu; 
#endif

static int dtlslisten = 0;



static const char *s_serverinfo_file = NULL;



#ifndef OPENSSL_NO_PSK

static char *psk_identity = "Client_identity";

char *psk_key = NULL;           /* by default PSK is not used */
@@ -269,33 +255,6 @@ err: 


#endif



static void s_server_init(void)

{

    accept_socket = -1;

    s_server_verify = SSL_VERIFY_NONE;

    s_dcert_file = NULL;

    s_dkey_file = NULL;

    s_dchain_file = NULL;

    s_cert_file = TEST_CERT;

    s_key_file = NULL;

    s_chain_file = NULL;

    s_cert_file2 = TEST_CERT2;

    s_key_file2 = NULL;

    ctx2 = NULL;

    s_nbio = 0;

    s_nbio_test = 0;

    ctx = NULL;

    www = 0;

    bio_s_out = NULL;

    s_debug = 0;

    s_msg = 0;

    s_quiet = 0;

    s_brief = 0;

    async = 0;

    split_send_fragment = 0;

    max_pipelines = 0;

}



static int local_argc = 0;

static char **local_argv;
@@ -924,21 +883,16 @@ int s_server_main(int argc, char *argv[]) 
    X509 *s_cert = NULL, *s_dcert = NULL;

    X509_VERIFY_PARAM *vpm = NULL;

    char *CApath = NULL, *CAfile = NULL, *chCApath = NULL, *chCAfile = NULL;

#ifndef OPENSSL_NO_DH

    char *dhfile = NULL;

#endif

    char *dpassarg = NULL, *dpass = NULL, *inrand = NULL;

    char *passarg = NULL, *pass = NULL, *vfyCApath = NULL, *vfyCAfile = NULL;

    char *crl_file = NULL, *prog;

#ifndef OPENSSL_NO_PSK

    char *p;

#endif

#ifdef AF_UNIX

    int unlink_unix_path = 0;

#endif

    do_server_cb server_cb;

    int vpmtouched = 0, build_chain = 0, no_cache = 0, ext_cache = 0;

#ifndef OPENSSL_NO_DH

    char *dhfile = NULL;

    int no_dhe = 0;

#endif

    int nocert = 0, ret = 1;
@@ -966,17 +920,36 @@ int s_server_main(int argc, char *argv[]) 
#ifndef OPENSSL_NO_PSK

    /* by default do not send a PSK identity hint */

    static char *psk_identity_hint = NULL;

    char *p;

#endif

#ifndef OPENSSL_NO_SRP

    char *srpuserseed = NULL;

    char *srp_verifier_file = NULL;

#endif

    int min_version = 0, max_version = 0, prot_opt = 0, no_prot_opt = 0;



    int s_server_verify = SSL_VERIFY_NONE;

    int s_server_session_id_context = 1; /* anything will do */

    const char *s_cert_file = TEST_CERT, *s_key_file = NULL, *s_chain_file = NULL;

    const char *s_cert_file2 = TEST_CERT2, *s_key_file2 = NULL;

    char *s_dcert_file = NULL, *s_dkey_file = NULL, *s_dchain_file = NULL;

    int s_tlsextstatus = 0, no_resume_ephemeral = 0;

    unsigned int split_send_fragment = 0, max_pipelines = 0;

    const char *s_serverinfo_file = NULL;



    /* Init of few remaining global variables */

    local_argc = argc;

    local_argv = argv;



    s_server_init();

    ctx = ctx2 = NULL;

    s_nbio = s_nbio_test = 0;

    www = 0;

    bio_s_out = NULL;

    s_debug = 0;

    s_msg = 0;

    s_quiet = 0;

    s_brief = 0;

    async = 0;



    cctx = SSL_CONF_CTX_new();

    vpm = X509_VERIFY_PARAM_new();

    if (cctx == NULL || vpm == NULL)
@@ -2280,13 +2253,11 @@ static int sv_body(int s, int stype, unsigned char *context) 
            for (;;) {

                /* should do a select for the write */

#ifdef RENEG

                {

                static count = 0;

                if (++count == 100) {

                    count = 0;

                    SSL_renegotiate(con);

                }

                }

#endif

                k = SSL_write(con, &(buf[l]), (unsigned int)i);

#ifndef OPENSSL_NO_SRP
@@ -2971,12 +2942,10 @@ static int www_body(int s, int stype, unsigned char *context) 


                for (j = 0; j < i;) {

#ifdef RENEG

                    {

                    static count = 0;

                    if (++count == 13) {

                        SSL_renegotiate(con);

                    }

                    }

#endif

                    k = BIO_write(io, &(buf[j]), i - j);

                    if (k <= 0) {

apps/s_time.c

+0 −3
Original line number Diff line number Diff line
@@ -38,9 +38,6 @@ 
 * #define TEST_CERT "client.pem"

 */



#undef BUFSIZZ

#define BUFSIZZ 1024*10



#undef min

#undef max

#define min(a,b) (((a) < (b)) ? (a) : (b))