diff options
| author | Matt Caswell <matt@openssl.org> | 2018-05-21 13:20:18 +0200 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2018-05-22 14:21:24 +0200 |
| commit | 1aac20f5095fca8691ef4495c3e7438c935a33dc (patch) | |
| tree | 8e6ae5d5a01b9a88c7be6cbe48d0e60afa08817d /test/sslapitest.c | |
| parent | ssl/ssl_txt: fix NULL-check (diff) | |
| download | openssl-1aac20f5095fca8691ef4495c3e7438c935a33dc.tar.xz openssl-1aac20f5095fca8691ef4495c3e7438c935a33dc.zip | |
Fix no-ec in combination with no-dh
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6321)
Diffstat (limited to 'test/sslapitest.c')
| -rw-r--r-- | test/sslapitest.c | 4 |
1 files changed, 3 insertions, 1 deletions
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; |