Skip to content

Commit a939eca

Browse files
committed
Adjusted cipher related serverd tests to adapt to their environment better
The failure case was on RedHat 10 the hard-coded cipher in the test was not available in openssl 3.2.2 provided by the system. Ticket: ENT-13494 Changelog: none (cherry picked from commit 91dafa126fccc57214ab5c627d942f5821b63bf8)
1 parent 4a05e3f commit a939eca

File tree

3 files changed

+29
-1
lines changed

3 files changed

+29
-1
lines changed

tests/acceptance/16_cf-serverd/serial/copy_from_ciphers_fail.cf

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,20 @@ body common control
55
version => "1.0";
66
}
77

8+
bundle agent init
9+
{
10+
vars:
11+
"first_supported_cipher" string => execresult("openssl ciphers -s | cut -d: -f1", "useshell");
12+
"data" data => '{ "cipher": "${first_supported_cipher}" }';
13+
14+
files:
15+
"$(this.promise_dirname)/nondefault_ciphers_tlsversion.srv"
16+
create => "true",
17+
template_method => "mustache",
18+
edit_template => "$(this.promise_dirname)/nondefault_ciphers_tlsversion.srv.mustache",
19+
template_data => @(data);
20+
}
21+
822
bundle agent test
923
{
1024
methods:

tests/acceptance/16_cf-serverd/serial/copy_from_ciphers_success.cf

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,20 @@ body common control
55
version => "1.0";
66
}
77

8+
bundle agent init
9+
{
10+
vars:
11+
"first_supported_cipher" string => execresult("openssl ciphers -s | cut -d: -f1", "useshell");
12+
"data" data => '{ "cipher": "${first_supported_cipher}" }';
13+
14+
files:
15+
"$(this.promise_dirname)/nondefault_ciphers_tlsversion.srv"
16+
create => "true",
17+
template_method => "mustache",
18+
edit_template => "$(this.promise_dirname)/nondefault_ciphers_tlsversion.srv.mustache",
19+
template_data => @(data);
20+
}
21+
822
bundle agent test
923
{
1024
meta:

tests/acceptance/16_cf-serverd/serial/nondefault_ciphers_tlsversion.srv renamed to tests/acceptance/16_cf-serverd/serial/nondefault_ciphers_tlsversion.srv.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ body server control
1515
port => "9888";
1616
1717
# Only this cipher is to be accepted
18-
allowciphers => "AES128-GCM-SHA256";
18+
allowciphers => "{{cipher}}";
1919
2020
# Allow only TLSv1.1 or higher
2121
allowtlsversion => "1.1";

0 commit comments

Comments
 (0)