summaryrefslogtreecommitdiffstats
path: root/test/recipes/80-test_ssl_new.t
diff options
context:
space:
mode:
authorTodd Short <tshort@akamai.com>2017-07-10 13:28:35 -0400
committerMatt Caswell <matt@openssl.org>2019-02-15 10:11:18 +0000
commit088dfa133561d7613b9391a56ddbce58f32c934a (patch)
tree46ebb1770ded52fd84e2202d80cac0ea9121b49f /test/recipes/80-test_ssl_new.t
parent9fc8f18f59f4a4c853466dca64a23b8af681bf1c (diff)
Add option to disable Extended Master Secret
Add SSL_OP64_NO_EXTENDED_MASTER_SECRET, that can be set on either an SSL or an SSL_CTX. When processing a ClientHello, if this flag is set, do not indicate that the EMS TLS extension was received in either the ssl3 object or the SSL_SESSION. Retain most of the sanity checks between the previous and current session during session resumption, but weaken the check when the current SSL object is configured to not use EMS. Reviewed-by: Paul Dale <paul.dale@oracle.com> Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/3910)
Diffstat (limited to 'test/recipes/80-test_ssl_new.t')
-rw-r--r--test/recipes/80-test_ssl_new.t3
1 files changed, 2 insertions, 1 deletions
diff --git a/test/recipes/80-test_ssl_new.t b/test/recipes/80-test_ssl_new.t
index fa98f24b57..31c4399dc3 100644
--- a/test/recipes/80-test_ssl_new.t
+++ b/test/recipes/80-test_ssl_new.t
@@ -28,7 +28,7 @@ map { s/\^// } @conf_files if $^O eq "VMS";
# We hard-code the number of tests to double-check that the globbing above
# finds all files as expected.
-plan tests => 29; # = scalar @conf_srcs
+plan tests => 30; # = scalar @conf_srcs
# Some test results depend on the configuration of enabled protocols. We only
# verify generated sources in the default configuration.
@@ -70,6 +70,7 @@ my %conf_dependent_tests = (
"25-cipher.conf" => disabled("poly1305") || disabled("chacha"),
"27-ticket-appdata.conf" => !$is_default_tls,
"28-seclevel.conf" => disabled("tls1_2") || $no_ec,
+ "30-extended-master-secret.conf" => disabled("tls1_2"),
);
# Add your test here if it should be skipped for some compile-time