Commit 057c676a authored by Richard Levitte's avatar Richard Levitte
Browse files

Fix no-ocsp 



Some compilers complain about unused variables, and some tests do
not run well without OCSP.

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent 81f9ce1e

apps/s_client.c

+6 −1
Original line number Diff line number Diff line
@@ -856,7 +856,10 @@ int s_client_main(int argc, char **argv) 
    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;

    int c_tlsextdebug = 0;

#ifndef OPENSSL_NO_OCSP

    int c_status_req = 0;

#endif

    BIO *bio_c_msg = NULL;



    FD_ZERO(&readfds);
@@ -1067,7 +1070,9 @@ int s_client_main(int argc, char **argv) 
            c_tlsextdebug = 1;

            break;

        case OPT_STATUS:

#ifndef OPENSSL_NO_OCSP

            c_status_req = 1;

#endif

            break;

        case OPT_WDEBUG:

#ifdef WATT32

apps/s_server.c

+10 −1
Original line number Diff line number Diff line
@@ -932,7 +932,10 @@ int s_server_main(int argc, char *argv[]) 
    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;

#ifndef OPENSSL_NO_OCSP

    int s_tlsextstatus = 0;

#endif

    int no_resume_ephemeral = 0;

    unsigned int split_send_fragment = 0, max_pipelines = 0;

    const char *s_serverinfo_file = NULL;
@@ -1206,14 +1209,20 @@ int s_server_main(int argc, char *argv[]) 
            s_tlsextdebug = 1;

            break;

        case OPT_STATUS:

#ifndef OPENSSL_NO_OCSP

            s_tlsextstatus = 1;

#endif

            break;

        case OPT_STATUS_VERBOSE:

#ifndef OPENSSL_NO_OCSP

            s_tlsextstatus = tlscstatp.verbose = 1;

#endif

            break;

        case OPT_STATUS_TIMEOUT:

#ifndef OPENSSL_NO_OCSP

            s_tlsextstatus = 1;

            tlscstatp.timeout = atoi(opt_arg());

#endif

            break;

        case OPT_STATUS_URL:

#ifndef OPENSSL_NO_OCSP

test/recipes/80-test_ssl_new.t

+3 −1
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ my $no_npn = disabled("nextprotoneg"); 
my $no_ct = disabled("ct");

my $no_ec = disabled("ec");

my $no_ec2m = disabled("ec2m");

my $no_ocsp = disabled("ocsp");



# Add your test here if the test conf.in generates test cases and/or

# expectations dynamically based on the OpenSSL compile-time config.
@@ -70,7 +71,8 @@ my %skip = ( 
  # We should review this once we have TLS 1.3.

  "13-fragmentation.conf" => disabled("tls1_2"),

  "14-curves.conf" => disabled("tls1_2") || $no_ec || $no_ec2m,

  "16-dtls-certstatus.conf" => $no_dtls

  "15-certstatus.conf" => $no_ocsp,

  "16-dtls-certstatus.conf" => $no_dtls || $no_ocsp,

);



foreach my $conf (@conf_files) {