2
0
mirror of https://github.com/xcat2/xcat-core.git synced 2026-01-10 18:32:35 +00:00

Do not default ciphers if version set

A custom TLS version can conflict with the default ciphers.
This commit is contained in:
Jarrod Johnson
2019-06-11 13:44:00 -04:00
parent 3110dc8fd7
commit bc20c2e9a4

View File

@@ -1553,7 +1553,7 @@ until ($quit) {
$extrasslargs{SSL_version} = "SSLv23:!SSLv2:!SSLv3:!TLSv1" unless length $extrasslargs{SSL_version};
if ($::XCATSITEVALS{xcatsslciphers}) { $extrasslargs{SSL_cipher_list} = $::XCATSITEVALS{xcatsslciphers}; }
$extrasslargs{SSL_cipher_list} = "ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384" unless length $extrasslargs{SSL_cipher_list};
$extrasslargs{SSL_cipher_list} = "ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384" unless length $extrasslargs{SSL_cipher_list} or length $extrasslargs{SSL_version};
use Data::Dumper;
$SIG{ALRM} = sub { $ssltimeout = 1; die; };