Skip to content

T
Third Party Openssl

OpenHarmony / Third Party Openssl
接近 2 年 前同步成功

通知 12
Star 18
Fork 1
T
Third Party Openssl
提交 cf156009 编写于 作者: M Matt Caswell
浏览文件
操作

Add SCTP testing for 11-dtls_resumption.conf 

Reviewed-by: NRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3286)
上级 00da4f4d
隐藏空白更改
内联 并排
Showing with 46 addition and 41 deletion
test/recipes/80-test_ssl_new.t
浏览文件 @ cf156009
...@@ -59,7 +59,7 @@ my %conf_dependent_tests = ( ...@@ -59,7 +59,7 @@ my %conf_dependent_tests = (
"05-sni.conf" => disabled("tls1_1"), "05-sni.conf" => disabled("tls1_1"),
"07-dtls-protocol-version.conf" => !$is_default_dtls || !disabled("sctp"), "07-dtls-protocol-version.conf" => !$is_default_dtls || !disabled("sctp"),
"10-resumption.conf" => !$is_default_tls, "10-resumption.conf" => !$is_default_tls,
"11-dtls_resumption.conf" => !$is_default_dtls, "11-dtls_resumption.conf" => !$is_default_dtls || !disabled("sctp"),
"16-dtls-certstatus.conf" => !$is_default_dtls || !disabled("sctp"), "16-dtls-certstatus.conf" => !$is_default_dtls || !disabled("sctp"),
"17-renegotiate.conf" => disabled("tls1_2"), "17-renegotiate.conf" => disabled("tls1_2"),
"18-dtls-renegotiate.conf" => disabled("dtls1_2") || !disabled("sctp"), "18-dtls-renegotiate.conf" => disabled("dtls1_2") || !disabled("sctp"),
......
test/ssl-tests/protocol_version.pm
浏览文件 @ cf156009
...@@ -163,46 +163,51 @@ sub generate_resumption_tests { ...@@ -163,46 +163,51 @@ sub generate_resumption_tests {
$resumption_expected = "No"; $resumption_expected = "No";
} }
foreach my $ticket ("SessionTicket", "-SessionTicket") { for (my $sctp = 0; $sctp < ($dtls && !disabled("sctp") ? 2 : 1);
# Client is flexible, server upgrades/downgrades. $sctp++) {
push @server_tests, { foreach my $ticket ("SessionTicket", "-SessionTicket") {
"name" => "resumption", # Client is flexible, server upgrades/downgrades.
"client" => { }, push @server_tests, {
"server" => { "name" => "resumption",
"MinProtocol" => $protocols[$original_protocol], "client" => { },
"MaxProtocol" => $protocols[$original_protocol], "server" => {
"Options" => $ticket, "MinProtocol" => $protocols[$original_protocol],
}, "MaxProtocol" => $protocols[$original_protocol],
"resume_server" => { "Options" => $ticket,
"MaxProtocol" => $protocols[$resume_protocol], },
}, "resume_server" => {
"test" => { "MaxProtocol" => $protocols[$resume_protocol],
"ExpectedProtocol" => $protocols[$resume_protocol], },
"Method" => $method, "test" => {
"HandshakeMode" => "Resume", "ExpectedProtocol" => $protocols[$resume_protocol],
"ResumptionExpected" => $resumption_expected, "Method" => $method,
} "HandshakeMode" => "Resume",
}; "ResumptionExpected" => $resumption_expected,
# Server is flexible, client upgrades/downgrades. }
push @client_tests, { };
"name" => "resumption", $server_tests[-1]{"test"}{"UseSCTP"} = "Yes" if $sctp;
"client" => { # Server is flexible, client upgrades/downgrades.
"MinProtocol" => $protocols[$original_protocol], push @client_tests, {
"MaxProtocol" => $protocols[$original_protocol], "name" => "resumption",
}, "client" => {
"server" => { "MinProtocol" => $protocols[$original_protocol],
"Options" => $ticket, "MaxProtocol" => $protocols[$original_protocol],
}, },
"resume_client" => { "server" => {
"MaxProtocol" => $protocols[$resume_protocol], "Options" => $ticket,
}, },
"test" => { "resume_client" => {
"ExpectedProtocol" => $protocols[$resume_protocol], "MaxProtocol" => $protocols[$resume_protocol],
"Method" => $method, },
"HandshakeMode" => "Resume", "test" => {
"ResumptionExpected" => $resumption_expected, "ExpectedProtocol" => $protocols[$resume_protocol],
} "Method" => $method,
}; "HandshakeMode" => "Resume",
"ResumptionExpected" => $resumption_expected,
}
};
$client_tests[-1]{"test"}{"UseSCTP"} = "Yes" if $sctp;
}
} }
} }
} }
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或