diff options
-rw-r--r-- | servconf.c | 4 | ||||
-rw-r--r-- | sshd.8 | 7 | ||||
-rw-r--r-- | sshd_config | 3 | ||||
-rw-r--r-- | sshd_config.5 | 5 |
4 files changed, 6 insertions, 13 deletions
diff --git a/servconf.c b/servconf.c index f0ab429a1..bf8ad671d 100644 --- a/servconf.c +++ b/servconf.c | |||
@@ -1,5 +1,5 @@ | |||
1 | 1 | ||
2 | /* $OpenBSD: servconf.c,v 1.323 2018/02/09 02:37:36 dtucker Exp $ */ | 2 | /* $OpenBSD: servconf.c,v 1.324 2018/02/16 02:32:40 djm Exp $ */ |
3 | /* | 3 | /* |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
5 | * All rights reserved | 5 | * All rights reserved |
@@ -247,8 +247,6 @@ fill_default_server_options(ServerOptions *options) | |||
247 | /* fill default hostkeys for protocols */ | 247 | /* fill default hostkeys for protocols */ |
248 | servconf_add_hostkey("[default]", 0, options, | 248 | servconf_add_hostkey("[default]", 0, options, |
249 | _PATH_HOST_RSA_KEY_FILE); | 249 | _PATH_HOST_RSA_KEY_FILE); |
250 | servconf_add_hostkey("[default]", 0, options, | ||
251 | _PATH_HOST_DSA_KEY_FILE); | ||
252 | #ifdef OPENSSL_HAS_ECC | 250 | #ifdef OPENSSL_HAS_ECC |
253 | servconf_add_hostkey("[default]", 0, options, | 251 | servconf_add_hostkey("[default]", 0, options, |
254 | _PATH_HOST_ECDSA_KEY_FILE); | 252 | _PATH_HOST_ECDSA_KEY_FILE); |
@@ -33,8 +33,8 @@ | |||
33 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 33 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
34 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 34 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
35 | .\" | 35 | .\" |
36 | .\" $OpenBSD: sshd.8,v 1.294 2018/02/05 04:02:53 djm Exp $ | 36 | .\" $OpenBSD: sshd.8,v 1.295 2018/02/16 02:32:40 djm Exp $ |
37 | .Dd $Mdocdate: February 5 2018 $ | 37 | .Dd $Mdocdate: February 16 2018 $ |
38 | .Dt SSHD 8 | 38 | .Dt SSHD 8 |
39 | .Os | 39 | .Os |
40 | .Sh NAME | 40 | .Sh NAME |
@@ -166,7 +166,6 @@ This option must be given if | |||
166 | is not run as root (as the normal | 166 | is not run as root (as the normal |
167 | host key files are normally not readable by anyone but root). | 167 | host key files are normally not readable by anyone but root). |
168 | The default is | 168 | The default is |
169 | .Pa /etc/ssh/ssh_host_dsa_key , | ||
170 | .Pa /etc/ssh/ssh_host_ecdsa_key , | 169 | .Pa /etc/ssh/ssh_host_ecdsa_key , |
171 | .Pa /etc/ssh/ssh_host_ed25519_key | 170 | .Pa /etc/ssh/ssh_host_ed25519_key |
172 | and | 171 | and |
@@ -874,7 +873,6 @@ This file is used in exactly the same way as | |||
874 | but allows host-based authentication without permitting login with | 873 | but allows host-based authentication without permitting login with |
875 | rlogin/rsh. | 874 | rlogin/rsh. |
876 | .Pp | 875 | .Pp |
877 | .It Pa /etc/ssh/ssh_host_dsa_key | ||
878 | .It Pa /etc/ssh/ssh_host_ecdsa_key | 876 | .It Pa /etc/ssh/ssh_host_ecdsa_key |
879 | .It Pa /etc/ssh/ssh_host_ed25519_key | 877 | .It Pa /etc/ssh/ssh_host_ed25519_key |
880 | .It Pa /etc/ssh/ssh_host_rsa_key | 878 | .It Pa /etc/ssh/ssh_host_rsa_key |
@@ -885,7 +883,6 @@ Note that | |||
885 | .Nm | 883 | .Nm |
886 | does not start if these files are group/world-accessible. | 884 | does not start if these files are group/world-accessible. |
887 | .Pp | 885 | .Pp |
888 | .It Pa /etc/ssh/ssh_host_dsa_key.pub | ||
889 | .It Pa /etc/ssh/ssh_host_ecdsa_key.pub | 886 | .It Pa /etc/ssh/ssh_host_ecdsa_key.pub |
890 | .It Pa /etc/ssh/ssh_host_ed25519_key.pub | 887 | .It Pa /etc/ssh/ssh_host_ed25519_key.pub |
891 | .It Pa /etc/ssh/ssh_host_rsa_key.pub | 888 | .It Pa /etc/ssh/ssh_host_rsa_key.pub |
diff --git a/sshd_config b/sshd_config index 4eb2e02e0..3109d5d73 100644 --- a/sshd_config +++ b/sshd_config | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: sshd_config,v 1.101 2017/03/14 07:19:07 djm Exp $ | 1 | # $OpenBSD: sshd_config,v 1.102 2018/02/16 02:32:40 djm Exp $ |
2 | 2 | ||
3 | # This is the sshd server system-wide configuration file. See | 3 | # This is the sshd server system-wide configuration file. See |
4 | # sshd_config(5) for more information. | 4 | # sshd_config(5) for more information. |
@@ -16,7 +16,6 @@ | |||
16 | #ListenAddress :: | 16 | #ListenAddress :: |
17 | 17 | ||
18 | #HostKey /etc/ssh/ssh_host_rsa_key | 18 | #HostKey /etc/ssh/ssh_host_rsa_key |
19 | #HostKey /etc/ssh/ssh_host_dsa_key | ||
20 | #HostKey /etc/ssh/ssh_host_ecdsa_key | 19 | #HostKey /etc/ssh/ssh_host_ecdsa_key |
21 | #HostKey /etc/ssh/ssh_host_ed25519_key | 20 | #HostKey /etc/ssh/ssh_host_ed25519_key |
22 | 21 | ||
diff --git a/sshd_config.5 b/sshd_config.5 index dff24fd12..fd7ab1a24 100644 --- a/sshd_config.5 +++ b/sshd_config.5 | |||
@@ -33,8 +33,8 @@ | |||
33 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 33 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
34 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 34 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
35 | .\" | 35 | .\" |
36 | .\" $OpenBSD: sshd_config.5,v 1.261 2018/02/10 06:54:38 djm Exp $ | 36 | .\" $OpenBSD: sshd_config.5,v 1.262 2018/02/16 02:32:40 djm Exp $ |
37 | .Dd $Mdocdate: February 10 2018 $ | 37 | .Dd $Mdocdate: February 16 2018 $ |
38 | .Dt SSHD_CONFIG 5 | 38 | .Dt SSHD_CONFIG 5 |
39 | .Os | 39 | .Os |
40 | .Sh NAME | 40 | .Sh NAME |
@@ -714,7 +714,6 @@ is not to load any certificates. | |||
714 | Specifies a file containing a private host key | 714 | Specifies a file containing a private host key |
715 | used by SSH. | 715 | used by SSH. |
716 | The defaults are | 716 | The defaults are |
717 | .Pa /etc/ssh/ssh_host_dsa_key , | ||
718 | .Pa /etc/ssh/ssh_host_ecdsa_key , | 717 | .Pa /etc/ssh/ssh_host_ecdsa_key , |
719 | .Pa /etc/ssh/ssh_host_ed25519_key | 718 | .Pa /etc/ssh/ssh_host_ed25519_key |
720 | and | 719 | and |