aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--crypto/openssh/sshd.86
-rw-r--r--crypto/openssh/sshd_config1
-rw-r--r--crypto/openssh/sshd_config.52
3 files changed, 2 insertions, 7 deletions
diff --git a/crypto/openssh/sshd.8 b/crypto/openssh/sshd.8
index 147d8be763c55..5c04ae056228a 100644
--- a/crypto/openssh/sshd.8
+++ b/crypto/openssh/sshd.8
@@ -217,8 +217,6 @@ host key files are normally not readable by anyone but root).
The default is
.Pa /etc/ssh/ssh_host_key
for protocol version 1, and
-.Pa /etc/ssh/ssh_host_rsa_key
-and
.Pa /etc/ssh/ssh_host_dsa_key
for protocol version 2.
It is possible to have multiple host key files for
@@ -562,14 +560,14 @@ Contains configuration data for
.Nm sshd .
The file format and configuration options are described in
.Xr sshd_config 5 .
-.It Pa /etc/ssh/ssh_host_key, /etc/ssh/ssh_host_dsa_key, /etc/ssh/ssh_host_rsa_key
+.It Pa /etc/ssh/ssh_host_key, /etc/ssh/ssh_host_dsa_key
These three files contain the private parts of the host keys.
These files should only be owned by root, readable only by root, and not
accessible to others.
Note that
.Nm
does not start if this file is group/world-accessible.
-.It Pa /etc/ssh/ssh_host_key.pub, /etc/ssh/ssh_host_dsa_key.pub, /etc/ssh/ssh_host_rsa_key.pub
+.It Pa /etc/ssh/ssh_host_key.pub, /etc/ssh/ssh_host_dsa_key.pub
These three files contain the public parts of the host keys.
These files should be world-readable but writable only by
root.
diff --git a/crypto/openssh/sshd_config b/crypto/openssh/sshd_config
index c1d0bc915e3bd..f01c85482a604 100644
--- a/crypto/openssh/sshd_config
+++ b/crypto/openssh/sshd_config
@@ -24,7 +24,6 @@
# HostKey for protocol version 1
#HostKey /etc/ssh/ssh_host_key
# HostKeys for protocol version 2
-#HostKey /etc/ssh/ssh_host_rsa_key
#HostKey /etc/ssh/ssh_host_dsa_key
# Lifetime and size of ephemeral version 1 server key
diff --git a/crypto/openssh/sshd_config.5 b/crypto/openssh/sshd_config.5
index 615ea27aedc1c..5507bd61bc3db 100644
--- a/crypto/openssh/sshd_config.5
+++ b/crypto/openssh/sshd_config.5
@@ -240,8 +240,6 @@ used by SSH.
The default is
.Pa /etc/ssh/ssh_host_key
for protocol version 1, and
-.Pa /etc/ssh/ssh_host_rsa_key
-and
.Pa /etc/ssh/ssh_host_dsa_key
for protocol version 2.
Note that