Skip to content

rsync-tls use TLSv1.3 as min, reduce 1.2 ciphers (for stunnel at startup to reduce CPU load) #1978

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 1 commit into from
Apr 17, 2026
+10 −2
Merged

rsync-tls use TLSv1.3 as min, reduce 1.2 ciphers (for stunnel at startup to reduce CPU load) #1978

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions mover-rsync-tls/server.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,19 @@ if [[ ! -d $TARGET ]] && ! test -b $BLOCK_TARGET; then
exit 1
fi

SSLVERSIONMIN="sslVersionMin = TLSv1.3"
if [[ -n ${SSL_VERSION_MIN} ]]; then
# Append sslVersionMin to stunnel conf
SSLVERSIONMIN="sslVersionMin = ${SSL_VERSION_MIN}"
fi

# Notes:
# Below we are setting ciphers = kPSK in stunnel.conf as we're already going
# to default to TLSv1.3 as the minimum. The ciphers setting only applies to
# TLSv1.2 and below, but with ciphers = PSK startup will still run a "per-day"
# regeneration job that will regenerate DH parameters - we can bypass this
# by setting ciphers = kPSK to avoid any Kx=DH ciphers.

if [[ -d $TARGET ]]; then
##############################
## Filesystem volume, use rsync
Expand Down Expand Up @@ -134,7 +142,7 @@ socket = r:TCP_KEEPIDLE=180
syslog = no

[rsync]
ciphers = PSK
ciphers = kPSK
PSKsecrets = $PSK_FILE
$SSLVERSIONMIN
; Port to listen for incoming connections from remote
Expand Down Expand Up @@ -180,7 +188,7 @@ socket = r:TCP_KEEPIDLE=180
syslog = no

[diskrsync]
ciphers = PSK
ciphers = kPSK
PSKsecrets = $PSK_FILE
$SSLVERSIONMIN
; Port to listen for incoming connections from remote
Expand Down
Loading