1 files changed, 3 insertions, 66 deletions

diff --git a/meta/recipes-connectivity/openssh/openssh/init b/meta/recipes-connectivity/openssh/openssh/init
index 386628afc8..34ba0f8460 100644
--- a/meta/recipes-connectivity/openssh/openssh/init
+++ b/meta/recipes-connectivity/openssh/openssh/init
@@ -19,25 +19,6 @@ fi
 [ -z "$SYSCONFDIR" ] && SYSCONFDIR=/etc/ssh
 mkdir -p $SYSCONFDIR
 
-parse_sshd_opts() {
-    set -- ${SSHD_OPTS} --
-    sshd_config=/etc/ssh/sshd_config
-    while true ; do
-        case "$1" in
-        -f*) if [ "$1" = "-f" ] ; then
-                 sshd_config="$2"
-                 shift
-             else
-                 sshd_config="${1#-f}"
-             fi
-             shift
-             ;;
-        --) shift; break;;
-        *) shift;;
-        esac
-    done
-}
-
 check_for_no_start() {
     # forget it if we're trying to start, and /etc/ssh/sshd_not_to_be_run exists
     if [ -e $SYSCONFDIR/sshd_not_to_be_run ]; then
@@ -58,57 +39,13 @@ check_config() {
         /usr/sbin/sshd -t $SSHD_OPTS || exit 1
 }
 
-check_keys() {
-        # parse location of keys
-        local HOST_KEY_RSA
-        local HOST_KEY_DSA
-        local HOST_KEY_ECDSA
-        local HOST_KEY_ED25519
-
-        parse_sshd_opts
-        HOST_KEY_RSA=$(grep ^HostKey "${sshd_config}" | grep _rsa_ | tail -1 | awk ' { print $2 } ')
-        [ -z "${HOST_KEY_RSA}" ] && HOST_KEY_RSA=$(grep HostKey "${sshd_config}" | grep _rsa_ | tail -1 | awk ' { print $2 } ')
-        [ -z "${HOST_KEY_RSA}" ] && HOST_KEY_RSA=$SYSCONFDIR/ssh_host_rsa_key
-        HOST_KEY_DSA=$(grep ^HostKey "${sshd_config}" | grep _dsa_ | tail -1 | awk ' { print $2 } ')
-        [ -z "${HOST_KEY_DSA}" ] && HOST_KEY_DSA=$(grep HostKey "${sshd_config}" | grep _dsa_ | tail -1 | awk ' { print $2 } ')
-        [ -z "${HOST_KEY_DSA}" ] && HOST_KEY_DSA=$SYSCONFDIR/ssh_host_dsa_key
-        HOST_KEY_ECDSA=$(grep ^HostKey "${sshd_config}" | grep _ecdsa_ | tail -1 | awk ' { print $2 } ')
-        [ -z "${HOST_KEY_ECDSA}" ] && HOST_KEY_ECDSA=$(grep HostKey "${sshd_config}" | grep _ecdsa_ | tail -1 | awk ' { print $2 } ')
-        [ -z "${HOST_KEY_ECDSA}" ] && HOST_KEY_ECDSA=$SYSCONFDIR/ssh_host_ecdsa_key
-        HOST_KEY_ED25519=$(grep ^HostKey "${sshd_config}" | grep _ed25519_ | tail -1 | awk ' { print $2 } ')
-        [ -z "${HOST_KEY_ED25519}" ] && HOST_KEY_ED25519=$(grep HostKey "${sshd_config}" | grep _ed25519_ | tail -1 | awk ' { print $2 } ')
-        [ -z "${HOST_KEY_ED25519}" ] && HOST_KEY_ED25519=$SYSCONFDIR/ssh_host_ed25519_key
-
-        # create keys if necessary
-        if [ ! -f $HOST_KEY_RSA ]; then
-                echo "  generating ssh RSA key..."
-                mkdir -p $(dirname $HOST_KEY_RSA)
-                ssh-keygen -q -f $HOST_KEY_RSA -N '' -t rsa
-        fi
-        if [ ! -f $HOST_KEY_ECDSA ]; then
-                echo "  generating ssh ECDSA key..."
-                mkdir -p $(dirname $HOST_KEY_ECDSA)
-                ssh-keygen -q -f $HOST_KEY_ECDSA -N '' -t ecdsa
-        fi
-        if [ ! -f $HOST_KEY_DSA ]; then
-                echo "  generating ssh DSA key..."
-                mkdir -p $(dirname $HOST_KEY_DSA)
-                ssh-keygen -q -f $HOST_KEY_DSA -N '' -t dsa
-        fi
-        if [ ! -f $HOST_KEY_ED25519 ]; then
-                echo "  generating ssh ED25519 key..."
-                mkdir -p $(dirname $HOST_KEY_ED25519)
-                ssh-keygen -q -f $HOST_KEY_ED25519 -N '' -t ed25519
-        fi
-}
-
 export PATH="${PATH:+$PATH:}/usr/sbin:/sbin"
 
 case "$1" in
   start)
         check_for_no_start
         echo "Starting OpenBSD Secure Shell server: sshd"
-        check_keys
+        @LIBEXECDIR@/sshd_check_keys
         check_privsep_dir
         start-stop-daemon -S -p $PIDFILE -x /usr/sbin/sshd -- $SSHD_OPTS
         echo "done."
@@ -121,7 +58,7 @@ case "$1" in
 
   reload|force-reload)
         check_for_no_start
-        check_keys
+        @LIBEXECDIR@/sshd_check_keys
         check_config
         echo -n "Reloading OpenBSD Secure Shell server's configuration"
         start-stop-daemon -K -p $PIDFILE -s 1 -x /usr/sbin/sshd
@@ -129,7 +66,7 @@ case "$1" in
         ;;
 
   restart)
-        check_keys
+        @LIBEXECDIR@/sshd_check_keys
         check_config
         echo -n "Restarting OpenBSD Secure Shell server: sshd"
         start-stop-daemon -K -p $PIDFILE --oknodo -x /usr/sbin/sshd