From: Danomi Manchego Date: Sun, 3 Aug 2014 01:21:19 +0000 (-0400) Subject: openssh: replace individual ssh-keygen calls with a single call X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=dfb3d5072aca549d30b5f0035fc0346b6df10c1a;p=buildroot.git openssh: replace individual ssh-keygen calls with a single call Since openssh-6.0, the ssh-keygen app has supported a -A option, which creates any missing keys. This frees us of having to add new ssh-keygen invocations as new key types are introduced. This also frees us of having to know the default key names and locations. So this patch replaces all the the init.d script invocations with a single "ssh-keygen -A" call. Note: the systemd service script *already* uses this option. Signed-off-by: Danomi Manchego Acked-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- diff --git a/package/openssh/S50sshd b/package/openssh/S50sshd index d3abf7c8ea..65bdb9070d 100644 --- a/package/openssh/S50sshd +++ b/package/openssh/S50sshd @@ -6,38 +6,8 @@ # Make sure the ssh-keygen progam exists [ -f /usr/bin/ssh-keygen ] || exit 0 -# Check for the SSH1 RSA key -if [ ! -f /etc/ssh_host_key ] ; then - echo Generating RSA Key... - /usr/bin/ssh-keygen -t rsa1 -f /etc/ssh_host_key -C '' -N '' -fi - -# Check for the SSH2 RSA key -if [ ! -f /etc/ssh_host_rsa_key ] ; then - echo Generating RSA Key... - /usr/bin/ssh-keygen -t rsa -f /etc/ssh_host_rsa_key -C '' -N '' -fi - -# Check for the SSH2 DSA key -if [ ! -f /etc/ssh_host_dsa_key ] ; then - echo Generating DSA Key... - echo - /usr/bin/ssh-keygen -t dsa -f /etc/ssh_host_dsa_key -C '' -N '' -fi - -# Check for the SSH2 ECDSA key -if [ ! -f /etc/ssh_host_ecdsa_key ]; then - echo Generating ECDSA Key... - echo - /usr/bin/ssh-keygen -t ecdsa -f /etc/ssh_host_ecdsa_key -C '' -N '' -fi - -# Check for the ed25519 key -if [ ! -f /etc/ssh_host_ed25519_key ]; then - echo Generating ed25519 Key... - echo - /usr/bin/ssh-keygen -t ed25519 -f /etc/ssh_host_ed25519_key -C '' -N '' -fi +# Create any missing keys +/usr/bin/ssh-keygen -A umask 077