[src/trunk]: src/distrib/evbarm/instkernel/sshramdisk Update to newer sshd (t...

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

details:   https://anonhg.NetBSD.org/src/rev/b98e348f674d
branches:  trunk
changeset: 458872:b98e348f674d
user:      martin <martin%NetBSD.org@localhost>
date:      Wed Aug 14 12:08:27 2019 +0000

description:
Update to newer sshd (the host key is the same as before, it already
was a rsa key). From Harold Gutch.

diffstat:

 distrib/evbarm/instkernel/sshramdisk/Makefile         |   4 +-
 distrib/evbarm/instkernel/sshramdisk/list             |   4 +-
 distrib/evbarm/instkernel/sshramdisk/ssh_host_dsa_key |  27 -------------------
 distrib/evbarm/instkernel/sshramdisk/ssh_host_rsa_key |  27 +++++++++++++++++++
 distrib/evbarm/instkernel/sshramdisk/sshd_config      |   5 +--
 5 files changed, 33 insertions(+), 34 deletions(-)

diffs (119 lines):

diff -r a3d2f40e5f74 -r b98e348f674d distrib/evbarm/instkernel/sshramdisk/Makefile
--- a/distrib/evbarm/instkernel/sshramdisk/Makefile     Wed Aug 14 09:54:34 2019 +0000
+++ b/distrib/evbarm/instkernel/sshramdisk/Makefile     Wed Aug 14 12:08:27 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.17 2018/04/08 15:48:39 mlelstv Exp $
+#      $NetBSD: Makefile,v 1.18 2019/08/14 12:08:27 martin Exp $
 
 .include <bsd.own.mk>
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -25,7 +25,7 @@
 .endif
 MAKEDEVTARGETS=        ramdisk
 IMAGEDEPENDS=  ${CRUNCHBIN} \
-               dot.profile master.passwd sshd_config ssh_host_dsa_key \
+               dot.profile master.passwd sshd_config ssh_host_rsa_key \
                ${NETBSDSRCDIR}/etc/group \
                ${NETBSDSRCDIR}/etc/netconfig ${DISTRIBDIR}/common/protocols \
                ${DISTRIBDIR}/common/services
diff -r a3d2f40e5f74 -r b98e348f674d distrib/evbarm/instkernel/sshramdisk/list
--- a/distrib/evbarm/instkernel/sshramdisk/list Wed Aug 14 09:54:34 2019 +0000
+++ b/distrib/evbarm/instkernel/sshramdisk/list Wed Aug 14 12:08:27 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: list,v 1.1 2013/03/19 22:16:53 garbled Exp $
+#      $NetBSD: list,v 1.2 2019/08/14 12:08:27 martin Exp $
 
 SRCDIRS        bin sbin external/bsd/less/bin crypto/external/bsd/openssh/bin/sshd usr.bin usr.sbin
 
@@ -88,4 +88,4 @@
 COPY   ${CURDIR}/dot.profile           .profile
 COPY   ${CURDIR}/inst.profile          inst/.profile
 COPY   ${CURDIR}/sshd_config           etc/ssh/sshd_config
-COPY   ${CURDIR}/ssh_host_dsa_key      etc/ssh/ssh_host_dsa_key 600
+COPY   ${CURDIR}/ssh_host_rsa_key      etc/ssh/ssh_host_rsa_key 600
diff -r a3d2f40e5f74 -r b98e348f674d distrib/evbarm/instkernel/sshramdisk/ssh_host_dsa_key
--- a/distrib/evbarm/instkernel/sshramdisk/ssh_host_dsa_key     Wed Aug 14 09:54:34 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEogIBAAKCAQEA2O4DZIR5YH7ESnvKmdTfJbPDzDZt44chEe27eFf28AhnfGYW
-962xKQbzzZqmMsH19CUAxpQ1UJ/o9MPULCZvYDwhn6t0cT3oNaIhj774Nw5Uni99
-d0DV/PSPsZlk22MySEsXI5rygnUg0ZMEQbw3pPlRYb8pjUwbkgsxR6KCDanFMhuK
-DtCTKbtK/y06BpievoFpENGpwwamfbpQxjK0MvT1TU744eKfBcWPtBl2KZM0cnbS
-vxNAvkSQrku2Sb56JzBo7b1TlxeDjBwHmdoFbUWjmXV5YsNkNdXvx52cro5o+z1f
-obpul8qpy+WQOsucRbltzfcBSRQ7lA09D4Hg5QIDAQABAoIBADQsOmCog9CzbF5F
-m5qX2ftlWsf4p0E7tLZtKNNuxJNCUjFXFFsJSTyG0Yg3k5VNlOvdImygJJp5ezuz
-BYqAy/SnQab3Q5AgxYJwtgWudmA3cB6DaXeO/mhSIWUjcWBaYTOF69DCaWT66qO8
-6h8tN2zUEcCii0nSbicXzghei0zhgE6RwwD0k07msQIgVX5XERUZSqQVg+Ls+VAu
-wp1OBW6HeXgSTGuRkzH9UuEobklf+KBtdSj+Nr+NdCg2gh4dNY86u6TT9dLwMw8T
-h8/oqfdnxlXiU4AfBsxWbHdAiqKBSa5IG2+4IsX4Zt3lKjygpRndNzqetfgjsz69
-ebbyjQECgYEA/GgDqx7k6QWOibKKb8DjdGfy+HdGqU5Bm9hSuhFHIwm0zSy+QbfV
-Z5nj1zj2pnm1/yfPKMrMEnZWuDTxMkgDQLv4UPdbWPvbBcowZWfy5st/bDOWtq9E
-SuHci941pNN9kqHDmDk9HPoHcYXmk4mA4W10lSGIHoxH3uCrbBeKj8UCgYEA3ASx
-GdmciAKOAt6gQzqOjWBs20CRqUvsonx5gagUOVmixpZrBumjNiEQg8kTCJF0pQ9O
-iWYTqqmzQCpw7HZsAMsjILUhZErGajbiAQ4Q7XOFvdGjfR1qZGgw/Qrx5MVmlwOo
-l3+PPdUP9shRbWFN0fbti9p+yvp9Pjltsp9Y/qECgYB9DrAandD/H3CzCtIKcsB/
-kW1R7A8Hna1mIPVEGYFse8eoDK4rc4D5tsargR679vvUcw3yASDBWP64gAqtRf7O
-mRN8UkJhQVAQe1AlPi6caWE15A2dcBNfIq8aYbukceD6wMlfZ6S+8aa0eYp3uR4x
-EwE7ToTZ1dlaNWjZwoQ1nQKBgBHtX/DXRmXer2uUcEKKFut2G+iRjkzZHuLueYgT
-BfLWVukPgJEDoITclNfoHmDoWTTJ1oBjjN6vDSgBTUo3K/20j5wuphXh8eDdr/Se
-DMsMSq1403VyXCTqSHOV3LfjTcSoS6hsgGNtZOuazue2sfyVvi1TFFm9p07WpxWS
-3lGBAoGAEzrlLi1veWatprss9qRYF3nKiMnf/K7J65EWOtZEOWwYHmmoUSMKo3Oy
-m8snS1RvJcorLnqUpkGEnhaF9XD2QFHwxUiTrvSQVkk5XTURjmJmWjnwCTMVlrF+
-1ce9hqg0uVc08TW4+Th3sZPBGqN2nrkPYUxYHSu6mLoR3R5j+2s=
------END RSA PRIVATE KEY-----
diff -r a3d2f40e5f74 -r b98e348f674d distrib/evbarm/instkernel/sshramdisk/ssh_host_rsa_key
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/distrib/evbarm/instkernel/sshramdisk/ssh_host_rsa_key     Wed Aug 14 12:08:27 2019 +0000
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEogIBAAKCAQEA2O4DZIR5YH7ESnvKmdTfJbPDzDZt44chEe27eFf28AhnfGYW
+962xKQbzzZqmMsH19CUAxpQ1UJ/o9MPULCZvYDwhn6t0cT3oNaIhj774Nw5Uni99
+d0DV/PSPsZlk22MySEsXI5rygnUg0ZMEQbw3pPlRYb8pjUwbkgsxR6KCDanFMhuK
+DtCTKbtK/y06BpievoFpENGpwwamfbpQxjK0MvT1TU744eKfBcWPtBl2KZM0cnbS
+vxNAvkSQrku2Sb56JzBo7b1TlxeDjBwHmdoFbUWjmXV5YsNkNdXvx52cro5o+z1f
+obpul8qpy+WQOsucRbltzfcBSRQ7lA09D4Hg5QIDAQABAoIBADQsOmCog9CzbF5F
+m5qX2ftlWsf4p0E7tLZtKNNuxJNCUjFXFFsJSTyG0Yg3k5VNlOvdImygJJp5ezuz
+BYqAy/SnQab3Q5AgxYJwtgWudmA3cB6DaXeO/mhSIWUjcWBaYTOF69DCaWT66qO8
+6h8tN2zUEcCii0nSbicXzghei0zhgE6RwwD0k07msQIgVX5XERUZSqQVg+Ls+VAu
+wp1OBW6HeXgSTGuRkzH9UuEobklf+KBtdSj+Nr+NdCg2gh4dNY86u6TT9dLwMw8T
+h8/oqfdnxlXiU4AfBsxWbHdAiqKBSa5IG2+4IsX4Zt3lKjygpRndNzqetfgjsz69
+ebbyjQECgYEA/GgDqx7k6QWOibKKb8DjdGfy+HdGqU5Bm9hSuhFHIwm0zSy+QbfV
+Z5nj1zj2pnm1/yfPKMrMEnZWuDTxMkgDQLv4UPdbWPvbBcowZWfy5st/bDOWtq9E
+SuHci941pNN9kqHDmDk9HPoHcYXmk4mA4W10lSGIHoxH3uCrbBeKj8UCgYEA3ASx
+GdmciAKOAt6gQzqOjWBs20CRqUvsonx5gagUOVmixpZrBumjNiEQg8kTCJF0pQ9O
+iWYTqqmzQCpw7HZsAMsjILUhZErGajbiAQ4Q7XOFvdGjfR1qZGgw/Qrx5MVmlwOo
+l3+PPdUP9shRbWFN0fbti9p+yvp9Pjltsp9Y/qECgYB9DrAandD/H3CzCtIKcsB/
+kW1R7A8Hna1mIPVEGYFse8eoDK4rc4D5tsargR679vvUcw3yASDBWP64gAqtRf7O
+mRN8UkJhQVAQe1AlPi6caWE15A2dcBNfIq8aYbukceD6wMlfZ6S+8aa0eYp3uR4x
+EwE7ToTZ1dlaNWjZwoQ1nQKBgBHtX/DXRmXer2uUcEKKFut2G+iRjkzZHuLueYgT
+BfLWVukPgJEDoITclNfoHmDoWTTJ1oBjjN6vDSgBTUo3K/20j5wuphXh8eDdr/Se
+DMsMSq1403VyXCTqSHOV3LfjTcSoS6hsgGNtZOuazue2sfyVvi1TFFm9p07WpxWS
+3lGBAoGAEzrlLi1veWatprss9qRYF3nKiMnf/K7J65EWOtZEOWwYHmmoUSMKo3Oy
+m8snS1RvJcorLnqUpkGEnhaF9XD2QFHwxUiTrvSQVkk5XTURjmJmWjnwCTMVlrF+
+1ce9hqg0uVc08TW4+Th3sZPBGqN2nrkPYUxYHSu6mLoR3R5j+2s=
+-----END RSA PRIVATE KEY-----
diff -r a3d2f40e5f74 -r b98e348f674d distrib/evbarm/instkernel/sshramdisk/sshd_config
--- a/distrib/evbarm/instkernel/sshramdisk/sshd_config  Wed Aug 14 09:54:34 2019 +0000
+++ b/distrib/evbarm/instkernel/sshramdisk/sshd_config  Wed Aug 14 12:08:27 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: sshd_config,v 1.1 2013/03/19 22:16:53 garbled Exp $
+#      $NetBSD: sshd_config,v 1.2 2019/08/14 12:08:27 martin Exp $
 
 # Special cut-down sshd_config for sshramdisk
 # Tim Rightnour <garbled%NetBSD.org@localhost>
@@ -8,7 +8,7 @@
 #ListenAddress 0.0.0.0
 #ListenAddress ::
 #Protocol 2
-#HostKey /etc/ssh/ssh_host_dsa_key
+#HostKey /etc/ssh/ssh_host_rsa_key
 LoginGraceTime 600
 # needed because sysinst is uid 0
 PermitRootLogin yes
@@ -16,5 +16,4 @@
 PasswordAuthentication yes
 # just in case
 PermitEmptyPasswords yes
-UsePrivilegeSeparation sandbox
 AllowUsers pi sysinst