diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2016-12-31 13:25:23 +0100 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2016-12-31 14:51:09 +0100 |
| commit | 47c5d00bdf1f9d50b4e34805e38b096110229576 (patch) | |
| tree | d53eef33ac8c171cd5d38c10bfe5ad6407e6df1f /tests/suite | |
| parent | 796c5237e8122d375e6649957ec5587e984c40f8 (diff) | |
| download | gnutls-47c5d00bdf1f9d50b4e34805e38b096110229576.tar.gz | |
tests: do not pass the -dhparams to openssl 1.1.0; it doesn't work
Diffstat (limited to 'tests/suite')
| -rwxr-xr-x | tests/suite/testcompat-main-openssl | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/tests/suite/testcompat-main-openssl b/tests/suite/testcompat-main-openssl index 2ebf46a231..f6ed067ae2 100755 --- a/tests/suite/testcompat-main-openssl +++ b/tests/suite/testcompat-main-openssl @@ -62,6 +62,9 @@ NO_X25519=$? ${SERV} version|grep -e '[1-9]\.[0-9]\.[0-9]' >/dev/null 2>&1 NO_TLS1_2=$? +${SERV} version|grep -e '[1-9]\.[1-9]\.[0-9]' >/dev/null 2>&1 +NO_DH_PARAMS=$? + ${SERV} s_server -help 2>&1|grep -e -ssl3 >/dev/null 2>&1 HAVE_SSL3=$? @@ -76,7 +79,11 @@ NO_NULL=$? . "${srcdir}/testcompat-common" -OPENSSL_DH_PARAMS_OPT="-dhparam \"${DH_PARAMS}\"" +if test "${NO_DH_PARAMS}" = 0;then + OPENSSL_DH_PARAMS_OPT="" +else + OPENSSL_DH_PARAMS_OPT="-dhparam \"${DH_PARAMS}\"" +fi echo "#################################################" echo "# Client mode tests (gnutls cli-openssl server) #" |