Commit b10794b5 authored by Cristian Stoica's avatar Cristian Stoica Committed by Richard Levitte
Browse files

s_server: fix warnings unused-but-set-variable (no-dh) 



This patch fixes the following two warnings when OpenSSL is built with no-dh option:

s_server.c: In function 's_server_main':
s_server.c:1105:25: warning: variable 'no_dhe' set but not used [-Wunused-but-set-variable]
     int no_tmp_rsa = 0, no_dhe = 0, no_ecdhe = 0, nocert = 0;
                         ^
s_server.c:1101:11: warning: variable 'dhfile' set but not used [-Wunused-but-set-variable]
     char *dhfile = NULL;
           ^
CLA: trivial
Signed-off-by: default avatarCristian Stoica <cristian.stoica@nxp.com>

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6087)
parent 60ced074

apps/s_server.c

+16 −5
Original line number Diff line number Diff line
@@ -1087,11 +1087,14 @@ int MAIN(int argc, char *argv[]) 
    char *chCApath = NULL, *chCAfile = NULL;

    char *vfyCApath = NULL, *vfyCAfile = NULL;

    unsigned char *context = NULL;

#ifndef OPENSSL_NO_DH

    char *dhfile = NULL;

    int no_dhe = 0;

#endif

    int badop = 0;

    int ret = 1;

    int build_chain = 0;

    int no_tmp_rsa = 0, no_dhe = 0, no_ecdhe = 0, nocert = 0;

    int no_tmp_rsa = 0, no_ecdhe = 0, nocert = 0;

    int state = 0;

    const SSL_METHOD *meth = NULL;

    int socket_type = SOCK_STREAM;
@@ -1239,11 +1242,15 @@ int MAIN(int argc, char *argv[]) 
            if (--argc < 1)

                goto bad;

            s_chain_file = *(++argv);

        } else if (strcmp(*argv, "-dhparam") == 0) {

        }

#ifndef OPENSSL_NO_DH

        else if (strcmp(*argv, "-dhparam") == 0) {

            if (--argc < 1)

                goto bad;

            dhfile = *(++argv);

        } else if (strcmp(*argv, "-dcertform") == 0) {

        }

#endif

        else if (strcmp(*argv, "-dcertform") == 0) {

            if (--argc < 1)

                goto bad;

            s_dcert_format = str2fmt(*(++argv));
@@ -1390,9 +1397,13 @@ int MAIN(int argc, char *argv[]) 
            verify_quiet = 1;

        } else if (strcmp(*argv, "-no_tmp_rsa") == 0) {

            no_tmp_rsa = 1;

        } else if (strcmp(*argv, "-no_dhe") == 0) {

        }

#ifndef OPENSSL_NO_DH

        else if (strcmp(*argv, "-no_dhe") == 0) {

            no_dhe = 1;

        } else if (strcmp(*argv, "-no_ecdhe") == 0) {

        }

#endif

        else if (strcmp(*argv, "-no_ecdhe") == 0) {

            no_ecdhe = 1;

        } else if (strcmp(*argv, "-no_resume_ephemeral") == 0) {

            no_resume_ephemeral = 1;