summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/openssh
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2011-09-15 14:10:50 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-09-16 12:30:22 (GMT)
commit0a27b8b76da5e913e93afbb31c4939b4bf06e235 (patch)
tree32f32149b30bc97c0e8ec7c460b1c33c210de263 /meta/recipes-connectivity/openssh
parentbb4a5c44da23a1bb363f1f081cf1644fd7975957 (diff)
downloadpoky-0a27b8b76da5e913e93afbb31c4939b4bf06e235.tar.gz
openssh: update init script to create ECDSA keys if needed
* Starting with openssh-5.8p1, the server will default to a newer key algorithm (ECDSA). (From OE-Core rev: 998e3acf0d38007fde10f47f98b71192685e19b9) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/openssh')
-rw-r--r--meta/recipes-connectivity/openssh/openssh-5.8p2/init4
-rw-r--r--meta/recipes-connectivity/openssh/openssh_5.8p2.bb2
2 files changed, 5 insertions, 1 deletions
diff --git a/meta/recipes-connectivity/openssh/openssh-5.8p2/init b/meta/recipes-connectivity/openssh/openssh-5.8p2/init
index b16cbd6..055dd22 100644
--- a/meta/recipes-connectivity/openssh/openssh-5.8p2/init
+++ b/meta/recipes-connectivity/openssh/openssh-5.8p2/init
@@ -36,6 +36,10 @@ check_keys() {
36 echo " generating ssh RSA key..." 36 echo " generating ssh RSA key..."
37 ssh-keygen -q -f /etc/ssh/ssh_host_rsa_key -N '' -t rsa 37 ssh-keygen -q -f /etc/ssh/ssh_host_rsa_key -N '' -t rsa
38 fi 38 fi
39 if [ ! -f /etc/ssh/ssh_host_ecdsa_key ]; then
40 echo " generating ssh ECDSA key..."
41 ssh-keygen -q -f /etc/ssh/ssh_host_ecdsa_key -N '' -t ecdsa
42 fi
39 if [ ! -f /etc/ssh/ssh_host_dsa_key ]; then 43 if [ ! -f /etc/ssh/ssh_host_dsa_key ]; then
40 echo " generating ssh DSA key..." 44 echo " generating ssh DSA key..."
41 ssh-keygen -q -f /etc/ssh/ssh_host_dsa_key -N '' -t dsa 45 ssh-keygen -q -f /etc/ssh/ssh_host_dsa_key -N '' -t dsa
diff --git a/meta/recipes-connectivity/openssh/openssh_5.8p2.bb b/meta/recipes-connectivity/openssh/openssh_5.8p2.bb
index 89b011d..030a83b 100644
--- a/meta/recipes-connectivity/openssh/openssh_5.8p2.bb
+++ b/meta/recipes-connectivity/openssh/openssh_5.8p2.bb
@@ -7,7 +7,7 @@ SECTION = "console/network"
7LICENSE = "BSD" 7LICENSE = "BSD"
8LIC_FILES_CHKSUM = "file://LICENCE;md5=bae9a689be41581503bcf95d8fb42c4e" 8LIC_FILES_CHKSUM = "file://LICENCE;md5=bae9a689be41581503bcf95d8fb42c4e"
9 9
10PR = "r1" 10PR = "r2"
11 11
12DEPENDS = "zlib openssl" 12DEPENDS = "zlib openssl"
13DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" 13DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"