The branch OpenSSL_1_1_0-stable has been updated via 6f99d9c22faf528f174303f997ecbd853d88ffe0 (commit) from 11bb654c60dee6fdfe30eba43e8310437b4b8ab0 (commit)
- Log ----------------------------------------------------------------- commit 6f99d9c22faf528f174303f997ecbd853d88ffe0 Author: Richard Levitte <levi...@openssl.org> Date: Mon Sep 19 15:08:58 2016 +0200 Fix no-ocsp Some compilers complain about unused variables, and some tests do not run well without OCSP. Reviewed-by: Rich Salz <rs...@openssl.org> (cherry picked from commit 057c676afb2a69b7d2bb9cf6e895e720a2a62b78) ----------------------------------------------------------------------- Summary of changes: apps/s_client.c | 7 ++++++- apps/s_server.c | 11 ++++++++++- test/recipes/80-test_ssl_new.t | 4 +++- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/apps/s_client.c b/apps/s_client.c index 0627ae8..41f6d48 100644 --- a/apps/s_client.c +++ b/apps/s_client.c @@ -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 diff --git a/apps/s_server.c b/apps/s_server.c index ebab7a2..2051459 100644 --- a/apps/s_server.c +++ b/apps/s_server.c @@ -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 diff --git a/test/recipes/80-test_ssl_new.t b/test/recipes/80-test_ssl_new.t index 46c2f42..47eab18 100644 --- a/test/recipes/80-test_ssl_new.t +++ b/test/recipes/80-test_ssl_new.t @@ -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) { _____ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits