summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2014-03-17 18:32:18 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-19 14:19:07 +0000
commit5baa4d7e684961b1572e3a692fba63beba582d94 (patch)
treebe2191ad972cf9230059d2d15f31e7b5144a6243 /meta/recipes-connectivity
parent724cddaff5bb7fdf15d028e68e32e59201d0cb74 (diff)
downloadpoky-5baa4d7e684961b1572e3a692fba63beba582d94.tar.gz
openssh: Update init file to add ED25519 Key generation
[YOCTO #5983] (From OE-Core rev: c859f9a9f765654a292d57a2bfcea8b4f4c65087) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r--meta/recipes-connectivity/openssh/openssh/init7
1 files changed, 6 insertions, 1 deletions
diff --git a/meta/recipes-connectivity/openssh/openssh/init b/meta/recipes-connectivity/openssh/openssh/init
index e7f3971324..37c8e7b907 100644
--- a/meta/recipes-connectivity/openssh/openssh/init
+++ b/meta/recipes-connectivity/openssh/openssh/init
@@ -20,6 +20,7 @@ mkdir -p $SYSCONFDIR
20HOST_KEY_RSA=$SYSCONFDIR/ssh_host_rsa_key 20HOST_KEY_RSA=$SYSCONFDIR/ssh_host_rsa_key
21HOST_KEY_DSA=$SYSCONFDIR/ssh_host_dsa_key 21HOST_KEY_DSA=$SYSCONFDIR/ssh_host_dsa_key
22HOST_KEY_ECDSA=$SYSCONFDIR/ssh_host_ecdsa_key 22HOST_KEY_ECDSA=$SYSCONFDIR/ssh_host_ecdsa_key
23HOST_KEY_ED25519=$SYSCONFDIR/ssh_host_ed25519_key
23 24
24check_for_no_start() { 25check_for_no_start() {
25 # forget it if we're trying to start, and /etc/ssh/sshd_not_to_be_run exists 26 # forget it if we're trying to start, and /etc/ssh/sshd_not_to_be_run exists
@@ -51,10 +52,14 @@ check_keys() {
51 echo " generating ssh ECDSA key..." 52 echo " generating ssh ECDSA key..."
52 ssh-keygen -q -f $HOST_KEY_ECDSA -N '' -t ecdsa 53 ssh-keygen -q -f $HOST_KEY_ECDSA -N '' -t ecdsa
53 fi 54 fi
54 if [ ! -f /etc/ssh/ssh_host_dsa_key ]; then 55 if [ ! -f $HOST_KEY_DSA ]; then
55 echo " generating ssh DSA key..." 56 echo " generating ssh DSA key..."
56 ssh-keygen -q -f $HOST_KEY_DSA -N '' -t dsa 57 ssh-keygen -q -f $HOST_KEY_DSA -N '' -t dsa
57 fi 58 fi
59 if [ ! -f $HOST_KEY_ED25519 ]; then
60 echo " generating ssh ED25519 key..."
61 ssh-keygen -q -f $HOST_KEY_ED25519 -N '' -t ed25519
62 fi
58} 63}
59 64
60export PATH="${PATH:+$PATH:}/usr/sbin:/sbin" 65export PATH="${PATH:+$PATH:}/usr/sbin:/sbin"