Commit a7f82a1a authored by Matt Caswell's avatar Matt Caswell
Browse files

Fix various OPENSSL_NO_* options 



This fixes compilation with various OPENSSL_NO_* options that got broken
during the big apps cleanup.

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent 6b41b3f5

apps/s_client.c

+14 −0
Original line number Diff line number Diff line
@@ -721,6 +721,20 @@ int s_client_main(int argc, char **argv) 
#endif

#ifdef OPENSSL_NO_SSL_TRACE

        case OPT_TRACE:

#endif

#ifdef OPENSSL_NO_PSK

        case OPT_PSK_IDENTITY:

        case OPT_PSK:

#endif

#ifdef OPENSSL_NO_SSL3

        case OPT_SSL3:

#endif

#ifdef OPENSSL_NO_DTLS1

        case OPT_DTLS:

        case OPT_DTLS1:

        case OPT_DTLS1_2:

        case OPT_TIMEOUT:

        case OPT_MTU:

#endif

        case OPT_EOF:

        case OPT_ERR:

apps/s_server.c

+16 −1
Original line number Diff line number Diff line
@@ -997,7 +997,10 @@ int s_server_main(int argc, char *argv[]) 
    char *CApath = NULL, *CAfile = NULL, *chCApath = NULL, *chCAfile = NULL;

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

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

    char *crl_file = NULL, *prog, *p;

    char *crl_file = NULL, *prog;

#ifndef OPENSSL_NO_PSK

    char *p;

#endif

    const char *unix_path = NULL;

#ifndef NO_SYS_UN_H

    int unlink_unix_path = 0;
@@ -1046,6 +1049,18 @@ int s_server_main(int argc, char *argv[]) 
    prog = opt_init(argc, argv, s_server_options);

    while ((o = opt_next()) != OPT_EOF) {

        switch (o) {

#ifdef OPENSSL_NO_PSK

        case OPT_PSK_HINT:

        case OPT_PSK:

#endif

#ifdef OPENSSL_NO_DTLS1

        case OPT_DTLS:

        case OPT_DTLS1:

        case OPT_DTLS1_2:

        case OPT_TIMEOUT:

        case OPT_MTU:

        case OPT_CHAIN:

#endif

        case OPT_EOF:

        case OPT_ERR:

 opthelp:

apps/srp.c

+10 −11
Original line number Diff line number Diff line
@@ -67,7 +67,6 @@ 
#include <openssl/txt_db.h>

#include <openssl/buffer.h>

#include <openssl/srp.h>



#include "apps.h"



# define BASE_SECTION    "srp"