aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/openssh/openssh
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:16:05 +0000
commitc859f9a9f765654a292d57a2bfcea8b4f4c65087 (patch)
tree12cb436cad76c45c401ca14be0bf13f35dd29df8 /meta/recipes-connectivity/openssh/openssh
parentab0bbeeb0b0f6c3c5c7298929cfee757d7bbb111 (diff)
downloadopenembedded-core-contrib-c859f9a9f765654a292d57a2bfcea8b4f4c65087.tar.gz
openembedded-core-contrib-c859f9a9f765654a292d57a2bfcea8b4f4c65087.tar.bz2
openembedded-core-contrib-c859f9a9f765654a292d57a2bfcea8b4f4c65087.zip
openssh: Update init file to add ED25519 Key generation
[YOCTO #5983] Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/openssh/openssh')
-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
HOST_KEY_RSA=$SYSCONFDIR/ssh_host_rsa_key
HOST_KEY_DSA=$SYSCONFDIR/ssh_host_dsa_key
HOST_KEY_ECDSA=$SYSCONFDIR/ssh_host_ecdsa_key
+HOST_KEY_ED25519=$SYSCONFDIR/ssh_host_ed25519_key
check_for_no_start() {
# forget it if we're trying to start, and /etc/ssh/sshd_not_to_be_run exists
@@ -51,10 +52,14 @@ check_keys() {
echo " generating ssh ECDSA key..."
ssh-keygen -q -f $HOST_KEY_ECDSA -N '' -t ecdsa
fi
- if [ ! -f /etc/ssh/ssh_host_dsa_key ]; then
+ if [ ! -f $HOST_KEY_DSA ]; then
echo " generating ssh DSA key..."
ssh-keygen -q -f $HOST_KEY_DSA -N '' -t dsa
fi
+ if [ ! -f $HOST_KEY_ED25519 ]; then
+ echo " generating ssh ED25519 key..."
+ ssh-keygen -q -f $HOST_KEY_ED25519 -N '' -t ed25519
+ fi
}
export PATH="${PATH:+$PATH:}/usr/sbin:/sbin"