summaryrefslogtreecommitdiffstats
path: root/test/ssl-tests
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2016-10-23 00:41:11 +0100
committerMatt Caswell <matt@openssl.org>2016-11-09 16:03:08 +0000
commitcd99883755f428ac47e8e2ccb21333b675ec22d9 (patch)
tree17d181d3e756614af7ea3d716af156198537f98b /test/ssl-tests
parent5506e835a87f3ab8be77c96d3ccea8566bd42335 (diff)
Add server side support for supported_versions extension
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'test/ssl-tests')
-rw-r--r--test/ssl-tests/17-renegotiate.conf4
-rw-r--r--test/ssl-tests/17-renegotiate.conf.in14
2 files changed, 14 insertions, 4 deletions
diff --git a/test/ssl-tests/17-renegotiate.conf b/test/ssl-tests/17-renegotiate.conf
index c47a9567dd..fffb572a47 100644
--- a/test/ssl-tests/17-renegotiate.conf
+++ b/test/ssl-tests/17-renegotiate.conf
@@ -18,6 +18,7 @@ client = 0-renegotiate-client-no-resume-client
[0-renegotiate-client-no-resume-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT
+MaxProtocol = TLSv1.2
Options = NoResumptionOnRenegotiation
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
@@ -45,6 +46,7 @@ client = 1-renegotiate-client-resume-client
[1-renegotiate-client-resume-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT
+MaxProtocol = TLSv1.2
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
[1-renegotiate-client-resume-client]
@@ -71,6 +73,7 @@ client = 2-renegotiate-server-no-resume-client
[2-renegotiate-server-no-resume-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT
+MaxProtocol = TLSv1.2
Options = NoResumptionOnRenegotiation
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
@@ -98,6 +101,7 @@ client = 3-renegotiate-server-resume-client
[3-renegotiate-server-resume-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT
+MaxProtocol = TLSv1.2
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
[3-renegotiate-server-resume-client]
diff --git a/test/ssl-tests/17-renegotiate.conf.in b/test/ssl-tests/17-renegotiate.conf.in
index a081617724..ab581eca72 100644
--- a/test/ssl-tests/17-renegotiate.conf.in
+++ b/test/ssl-tests/17-renegotiate.conf.in
@@ -19,7 +19,8 @@ our @tests = (
{
name => "renegotiate-client-no-resume",
server => {
- "Options" => "NoResumptionOnRenegotiation"
+ "Options" => "NoResumptionOnRenegotiation",
+ "MaxProtocol" => "TLSv1.2"
},
client => {},
test => {
@@ -31,7 +32,9 @@ our @tests = (
},
{
name => "renegotiate-client-resume",
- server => {},
+ server => {
+ "MaxProtocol" => "TLSv1.2"
+ },
client => {},
test => {
"Method" => "TLS",
@@ -43,7 +46,8 @@ our @tests = (
{
name => "renegotiate-server-no-resume",
server => {
- "Options" => "NoResumptionOnRenegotiation"
+ "Options" => "NoResumptionOnRenegotiation",
+ "MaxProtocol" => "TLSv1.2"
},
client => {},
test => {
@@ -55,7 +59,9 @@ our @tests = (
},
{
name => "renegotiate-server-resume",
- server => {},
+ server => {
+ "MaxProtocol" => "TLSv1.2"
+ },
client => {},
test => {
"Method" => "TLS",