summaryrefslogtreecommitdiff
path: root/deps/openssl/openssl/test/ssl-tests/19-mac-then-encrypt.conf.in
diff options
context:
space:
mode:
authorSam Roberts <vieuxtech@gmail.com>2018-11-22 10:39:20 -0800
committerSam Roberts <vieuxtech@gmail.com>2019-01-22 13:32:34 -0800
commit4231ad04f0b2aee5bda6be94715d4b70badaac8b (patch)
tree19f189fae6828708ebd37e466ce4a7716494b96a /deps/openssl/openssl/test/ssl-tests/19-mac-then-encrypt.conf.in
parent5d80f9ea6091847176fa47fb1395fdffc4af9164 (diff)
downloadandroid-node-v8-4231ad04f0b2aee5bda6be94715d4b70badaac8b.tar.gz
android-node-v8-4231ad04f0b2aee5bda6be94715d4b70badaac8b.tar.bz2
android-node-v8-4231ad04f0b2aee5bda6be94715d4b70badaac8b.zip
deps: upgrade openssl sources to 1.1.1a
This updates all sources in deps/openssl/openssl with openssl-1.1.1a. PR-URL: https://github.com/nodejs/node/pull/25381 Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com> Reviewed-By: Shigeki Ohtsu <ohtsu@ohtsu.org>
Diffstat (limited to 'deps/openssl/openssl/test/ssl-tests/19-mac-then-encrypt.conf.in')
-rw-r--r--deps/openssl/openssl/test/ssl-tests/19-mac-then-encrypt.conf.in13
1 files changed, 13 insertions, 0 deletions
diff --git a/deps/openssl/openssl/test/ssl-tests/19-mac-then-encrypt.conf.in b/deps/openssl/openssl/test/ssl-tests/19-mac-then-encrypt.conf.in
index 01afe251a7..dfe529c9cd 100644
--- a/deps/openssl/openssl/test/ssl-tests/19-mac-then-encrypt.conf.in
+++ b/deps/openssl/openssl/test/ssl-tests/19-mac-then-encrypt.conf.in
@@ -11,6 +11,8 @@
package ssltests;
+use OpenSSL::Test::Utils;
+
our @tests = (
{
name => "disable-encrypt-then-mac-server-sha",
@@ -19,6 +21,7 @@ our @tests = (
},
client => {
"CipherString" => "AES128-SHA",
+ "MaxProtocol" => "TLSv1.2"
},
test => {
"ExpectedResult" => "Success",
@@ -31,6 +34,7 @@ our @tests = (
client => {
"CipherString" => "AES128-SHA",
"Options" => "-EncryptThenMac",
+ "MaxProtocol" => "TLSv1.2"
},
test => {
"ExpectedResult" => "Success",
@@ -44,11 +48,15 @@ our @tests = (
client => {
"CipherString" => "AES128-SHA",
"Options" => "-EncryptThenMac",
+ "MaxProtocol" => "TLSv1.2"
},
test => {
"ExpectedResult" => "Success",
},
},
+);
+
+my @tests_tls1_2 = (
{
name => "disable-encrypt-then-mac-server-sha2",
server => {
@@ -56,6 +64,7 @@ our @tests = (
},
client => {
"CipherString" => "AES128-SHA256",
+ "MaxProtocol" => "TLSv1.2"
},
test => {
"ExpectedResult" => "Success",
@@ -68,6 +77,7 @@ our @tests = (
client => {
"CipherString" => "AES128-SHA256",
"Options" => "-EncryptThenMac",
+ "MaxProtocol" => "TLSv1.2"
},
test => {
"ExpectedResult" => "Success",
@@ -81,9 +91,12 @@ our @tests = (
client => {
"CipherString" => "AES128-SHA256",
"Options" => "-EncryptThenMac",
+ "MaxProtocol" => "TLSv1.2"
},
test => {
"ExpectedResult" => "Success",
},
},
);
+
+push @tests, @tests_tls1_2 unless disabled("tls1_2");