Module Name: src
Committed By: msaitoh
Date: Fri Aug 23 04:22:49 UTC 2019
Modified Files:
src/distrib/evbarm/instkernel/sshramdisk [netbsd-9]: Makefile list
sshd_config
Added Files:
src/distrib/evbarm/instkernel/sshramdisk [netbsd-9]: ssh_host_rsa_key
Removed Files:
src/distrib/evbarm/instkernel/sshramdisk [netbsd-9]: ssh_host_dsa_key
Log Message:
Pullup the following revision (requested by martin in ticket #105):
distrib/evbarm/instkernel/sshramdisk/Makefile 1.18
distrib/evbarm/instkernel/sshramdisk/list 1.2
distrib/evbarm/instkernel/sshramdisk/sshd_config 1.2
distrib/evbarm/instkernel/sshramdisk/ssh_host_dsa_key delete
distrib/evbarm/instkernel/sshramdisk/ssh_host_rsa_key 1.1
Update to newer sshd (the host key is the same as before, it already
was a rsa key). From Harold Gutch
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.17.4.1 \
src/distrib/evbarm/instkernel/sshramdisk/Makefile
cvs rdiff -u -r1.1 -r1.1.38.1 src/distrib/evbarm/instkernel/sshramdisk/list \
src/distrib/evbarm/instkernel/sshramdisk/sshd_config
cvs rdiff -u -r1.1 -r0 \
src/distrib/evbarm/instkernel/sshramdisk/ssh_host_dsa_key
cvs rdiff -u -r0 -r1.1.2.2 \
src/distrib/evbarm/instkernel/sshramdisk/ssh_host_rsa_key
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/evbarm/instkernel/sshramdisk/Makefile
diff -u src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.17 src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.17.4.1
--- src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.17 Sun Apr 8 15:48:39 2018
+++ src/distrib/evbarm/instkernel/sshramdisk/Makefile Fri Aug 23 04:22:49 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2018/04/08 15:48:39 mlelstv Exp $
+# $NetBSD: Makefile,v 1.17.4.1 2019/08/23 04:22:49 msaitoh Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -25,7 +25,7 @@ IMAGEENDIAN= be
.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
Index: src/distrib/evbarm/instkernel/sshramdisk/list
diff -u src/distrib/evbarm/instkernel/sshramdisk/list:1.1 src/distrib/evbarm/instkernel/sshramdisk/list:1.1.38.1
--- src/distrib/evbarm/instkernel/sshramdisk/list:1.1 Tue Mar 19 22:16:53 2013
+++ src/distrib/evbarm/instkernel/sshramdisk/list Fri Aug 23 04:22:49 2019
@@ -1,4 +1,4 @@
-# $NetBSD: list,v 1.1 2013/03/19 22:16:53 garbled Exp $
+# $NetBSD: list,v 1.1.38.1 2019/08/23 04:22:49 msaitoh Exp $
SRCDIRS bin sbin external/bsd/less/bin crypto/external/bsd/openssh/bin/sshd usr.bin usr.sbin
@@ -88,4 +88,4 @@ COPY ${DISTRIBDIR}/common/services etc/
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
Index: src/distrib/evbarm/instkernel/sshramdisk/sshd_config
diff -u src/distrib/evbarm/instkernel/sshramdisk/sshd_config:1.1 src/distrib/evbarm/instkernel/sshramdisk/sshd_config:1.1.38.1
--- src/distrib/evbarm/instkernel/sshramdisk/sshd_config:1.1 Tue Mar 19 22:16:53 2013
+++ src/distrib/evbarm/instkernel/sshramdisk/sshd_config Fri Aug 23 04:22:49 2019
@@ -1,4 +1,4 @@
-# $NetBSD: sshd_config,v 1.1 2013/03/19 22:16:53 garbled Exp $
+# $NetBSD: sshd_config,v 1.1.38.1 2019/08/23 04:22:49 msaitoh Exp $
# Special cut-down sshd_config for sshramdisk
# Tim Rightnour <garb...@netbsd.org>
@@ -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 @@ AuthorizedKeysFile .ssh/authorized_keys
PasswordAuthentication yes
# just in case
PermitEmptyPasswords yes
-UsePrivilegeSeparation sandbox
AllowUsers pi sysinst
Added files:
Index: src/distrib/evbarm/instkernel/sshramdisk/ssh_host_rsa_key
diff -u /dev/null src/distrib/evbarm/instkernel/sshramdisk/ssh_host_rsa_key:1.1.2.2
--- /dev/null Fri Aug 23 04:22:49 2019
+++ src/distrib/evbarm/instkernel/sshramdisk/ssh_host_rsa_key Fri Aug 23 04:22:49 2019
@@ -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-----
