Skip to content

Commit f17edfa

Browse files
Xinyu Zhou6543lunnywxiaoguang
authored
Remove deprecated DSA host key from Docker Container (#21522)
Since OpenSSH 7.0 and greater similarly disable the ssh-dss (DSA) public key algorithm, and recommend against its use. http://www.openssh.com/legacy.html ## ⚠️ BREAKING ⚠️ This patch will remove DSA host key form OpenSSH daemon configuration file. Signed-off-by: baronbunny <[email protected]> Co-authored-by: 6543 <[email protected]> Co-authored-by: Lunny Xiao <[email protected]> Co-authored-by: wxiaoguang <[email protected]>
1 parent f8f859b commit f17edfa

File tree

2 files changed

+0
-12
lines changed

2 files changed

+0
-12
lines changed

docker/root/etc/s6/openssh/setup

-10
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,6 @@ if [ ! -f /data/ssh/ssh_host_rsa_key ]; then
1414
ssh-keygen -t rsa -b 2048 -f /data/ssh/ssh_host_rsa_key -N "" > /dev/null
1515
fi
1616

17-
if [ ! -f /data/ssh/ssh_host_dsa_key ]; then
18-
echo "Generating /data/ssh/ssh_host_dsa_key..."
19-
ssh-keygen -t dsa -f /data/ssh/ssh_host_dsa_key -N "" > /dev/null
20-
fi
21-
2217
if [ ! -f /data/ssh/ssh_host_ecdsa_key ]; then
2318
echo "Generating /data/ssh/ssh_host_ecdsa_key..."
2419
ssh-keygen -t ecdsa -b 256 -f /data/ssh/ssh_host_ecdsa_key -N "" > /dev/null
@@ -36,17 +31,12 @@ if [ -e /data/ssh/ssh_host_ecdsa_cert ]; then
3631
SSH_ECDSA_CERT=${SSH_ECDSA_CERT:-"/data/ssh/ssh_host_ecdsa_cert"}
3732
fi
3833

39-
if [ -e /data/ssh/ssh_host_dsa_cert ]; then
40-
SSH_DSA_CERT=${SSH_DSA_CERT:-"/data/ssh/ssh_host_dsa_cert"}
41-
fi
42-
4334
if [ -d /etc/ssh ]; then
4435
SSH_PORT=${SSH_PORT:-"22"} \
4536
SSH_LISTEN_PORT=${SSH_LISTEN_PORT:-"${SSH_PORT}"} \
4637
SSH_ED25519_CERT="${SSH_ED25519_CERT:+"HostCertificate "}${SSH_ED25519_CERT}" \
4738
SSH_RSA_CERT="${SSH_RSA_CERT:+"HostCertificate "}${SSH_RSA_CERT}" \
4839
SSH_ECDSA_CERT="${SSH_ECDSA_CERT:+"HostCertificate "}${SSH_ECDSA_CERT}" \
49-
SSH_DSA_CERT="${SSH_DSA_CERT:+"HostCertificate "}${SSH_DSA_CERT}" \
5040
SSH_MAX_STARTUPS="${SSH_MAX_STARTUPS:+"MaxStartups "}${SSH_MAX_STARTUPS}" \
5141
SSH_MAX_SESSIONS="${SSH_MAX_SESSIONS:+"MaxSessions "}${SSH_MAX_SESSIONS}" \
5242
SSH_INCLUDE_FILE="${SSH_INCLUDE_FILE:+"Include "}${SSH_INCLUDE_FILE}" \

docker/root/etc/templates/sshd_config

-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ HostKey /data/ssh/ssh_host_rsa_key
1616
${SSH_RSA_CERT}
1717
HostKey /data/ssh/ssh_host_ecdsa_key
1818
${SSH_ECDSA_CERT}
19-
HostKey /data/ssh/ssh_host_dsa_key
20-
${SSH_DSA_CERT}
2119

2220
AuthorizedKeysFile .ssh/authorized_keys
2321
AuthorizedPrincipalsFile .ssh/authorized_principals

0 commit comments

Comments
 (0)