[src/trunk]: src/etc/rc.d With the new version of OpenSSH, SSHv1 is no longer...

[sevan <sevan%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/46db9ef62490
branches:  trunk
changeset: 356678:46db9ef62490
user:      sevan <sevan%NetBSD.org@localhost>
date:      Sat Oct 07 21:41:51 2017 +0000

description:
With the new version of OpenSSH, SSHv1 is no longer supported server-side.
Along with that rsa1 type keys are no longer supported.
Don't try to generate such keys on new systems.

ok christos

diffstat:

 etc/rc.d/sshd |  6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diffs (29 lines):

diff -r 9e5bc4c2386f -r 46db9ef62490 etc/rc.d/sshd
--- a/etc/rc.d/sshd     Sat Oct 07 21:15:48 2017 +0000
+++ b/etc/rc.d/sshd     Sat Oct 07 21:41:51 2017 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: sshd,v 1.23 2014/10/19 16:33:01 christos Exp $
+# $NetBSD: sshd,v 1.24 2017/10/07 21:41:51 sevan Exp $
 #
 
 # PROVIDE: sshd
@@ -35,7 +35,6 @@
                        "${keygen}" -t "${type}" ${bitarg} -f "${f}" -N ''
                fi
        done << _EOF
-rsa1   0       ssh_host_key            1       RSA
 dsa    1024    ssh_host_dsa_key        2       DSA
 ecdsa  521     ssh_host_ecdsa_key      1       ECDSA
 ed25519        -1      ssh_host_ed25519_key    1       ED25519
@@ -46,8 +45,7 @@
 
 sshd_precmd()
 {
-       if [ ! -f /etc/ssh/ssh_host_key -o \
-           ! -f /etc/ssh/ssh_host_dsa_key -o \
+       if [ ! -f /etc/ssh/ssh_host_dsa_key -o \
            ! -f /etc/ssh/ssh_host_ecdsa_key -o \
            ! -f /etc/ssh/ssh_host_ed25519_key -o \
            ! -f /etc/ssh/ssh_host_rsa_key ]; then