From 1aac20f5095fca8691ef4495c3e7438c935a33dc Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Mon, 21 May 2018 12:20:18 +0100 Subject: Fix no-ec in combination with no-dh Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/6321) --- test/sslapitest.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'test/sslapitest.c') diff --git a/test/sslapitest.c b/test/sslapitest.c index fe1c1e6ff3..f2978aa078 100644 --- a/test/sslapitest.c +++ b/test/sslapitest.c @@ -4473,7 +4473,9 @@ static int test_info_callback(int tst) int tlsvers; if (tst < 2) { -#ifndef OPENSSL_NO_TLS1_2 +/* We need either ECDHE or DHE for the TLSv1.2 test to work */ +#if !defined(OPENSSL_NO_TLS1_2) && (!defined(OPENSSL_NO_EC) \ + || !defined(OPENSSL_NO_DH)) tlsvers = TLS1_2_VERSION; #else return 1; -- cgit v1.2.3