diff --git a/src/internal.c b/src/internal.c index f88b8db24..6cf1f05ba 100644 --- a/src/internal.c +++ b/src/internal.c @@ -2164,14 +2164,14 @@ void InitSuites(Suites* suites, ProtocolVersion pv, word16 haveRSA, #endif #ifdef BUILD_TLS_DHE_RSA_WITH_AES_256_CBC_SHA256 - if (tls1_2 && haveDH && haveRSA) { + if (tls && haveDH && haveRSA) { suites->suites[idx++] = 0; suites->suites[idx++] = TLS_DHE_RSA_WITH_AES_256_CBC_SHA256; } #endif #ifdef BUILD_TLS_DHE_RSA_WITH_AES_128_CBC_SHA256 - if (tls1_2 && haveDH && haveRSA) { + if (tls && haveDH && haveRSA) { suites->suites[idx++] = 0; suites->suites[idx++] = TLS_DHE_RSA_WITH_AES_128_CBC_SHA256; } diff --git a/tests/test-dtls.conf b/tests/test-dtls.conf index baf4d40b3..2a994578b 100644 --- a/tests/test-dtls.conf +++ b/tests/test-dtls.conf @@ -190,6 +190,16 @@ -v 3 -l AES256-SHA +# server DTLSv1 AES128-SHA256 +-u +-v 2 +-l AES128-SHA256 + +# client DTLSv1 AES128-SHA256 +-u +-v 2 +-l AES128-SHA256 + # server DTLSv1.2 AES128-SHA256 -u -v 3 @@ -200,6 +210,16 @@ -v 3 -l AES128-SHA256 +# server DTLSv1 AES256-SHA256 +-u +-v 2 +-l AES256-SHA256 + +# client DTLSv1 AES256-SHA256 +-u +-v 2 +-l AES256-SHA256 + # server DTLSv1.2 AES256-SHA256 -u -v 3 diff --git a/tests/test.conf b/tests/test.conf index 057ea8857..894452a91 100644 --- a/tests/test.conf +++ b/tests/test.conf @@ -162,6 +162,22 @@ -v 1 -l AES256-SHA +# server TLSv1 AES128-SHA256 +-v 1 +-l AES128-SHA256 + +# client TLSv1 AES128-SHA256 +-v 1 +-l AES128-SHA256 + +# server TLSv1 AES256-SHA256 +-v 1 +-l AES256-SHA256 + +# client TLSv1 AES256-SHA256 +-v 1 +-l AES256-SHA256 + # server TLSv1.1 RC4-SHA -v 2 -l RC4-SHA @@ -202,6 +218,30 @@ -v 2 -l AES128-SHA +# server TLSv1.1 AES256-SHA +-v 2 +-l AES256-SHA + +# client TLSv1.1 AES256-SHA +-v 2 +-l AES256-SHA + +# server TLSv1.1 AES128-SHA256 +-v 2 +-l AES128-SHA256 + +# client TLSv1.1 AES128-SHA256 +-v 2 +-l AES128-SHA256 + +# server TLSv1.1 AES256-SHA256 +-v 2 +-l AES256-SHA256 + +# client TLSv1.1 AES256-SHA256 +-v 2 +-l AES256-SHA256 + # server TLSv1.2 RC4-SHA -v 3 -l RC4-SHA @@ -1011,6 +1051,22 @@ -v 1 -l DHE-RSA-AES256-SHA +# server TLSv1 DHE AES128-SHA256 +-v 1 +-l DHE-RSA-AES128-SHA256 + +# client TLSv1 DHE AES128-SHA256 +-v 1 +-l DHE-RSA-AES128-SHA256 + +# server TLSv1 DHE AES256-SHA256 +-v 1 +-l DHE-RSA-AES256-SHA256 + +# client TLSv1 DHE AES256-SHA256 +-v 1 +-l DHE-RSA-AES256-SHA256 + # server TLSv1.1 DHE AES128 -v 2 -l DHE-RSA-AES128-SHA @@ -1027,6 +1083,22 @@ -v 2 -l DHE-RSA-AES256-SHA +# server TLSv1.1 DHE AES128-SHA256 +-v 2 +-l DHE-RSA-AES128-SHA256 + +# client TLSv1.1 DHE AES128-SHA256 +-v 2 +-l DHE-RSA-AES128-SHA256 + +# server TLSv1.1 DHE AES256-SHA256 +-v 2 +-l DHE-RSA-AES256-SHA256 + +# client TLSv1.1 DHE AES256-SHA256 +-v 2 +-l DHE-RSA-AES256-SHA256 + # server TLSv1.1 DHE 3DES -v 2 -l EDH-RSA-DES-CBC3-SHA