From 0f86d8a06cf4ac31d1dbf6391e2cf56b3aa89cf3 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Wed, 10 Jul 2024 16:07:47 +0200
Subject: [PATCH] openssh: 9.8 removes DSA at compile time

---
 src/etc/inc/plugins.inc.d/openssh.inc | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/etc/inc/plugins.inc.d/openssh.inc b/src/etc/inc/plugins.inc.d/openssh.inc
index effc3e427..94b27bd67 100644
--- a/src/etc/inc/plugins.inc.d/openssh.inc
+++ b/src/etc/inc/plugins.inc.d/openssh.inc
@@ -123,19 +123,12 @@ function openssh_configure_do($verbose = false, $interface = '')
     /* make ssh home directory */
     @mkdir('/var/empty', 0555, true);
 
-    $keys = array(
+    $keys = [
         /* .pub files are implied */
         'rsa' => 'ssh_host_rsa_key',
         'ecdsa' => 'ssh_host_ecdsa_key',
         'ed25519' => 'ssh_host_ed25519_key',
-    );
-
-    $keys_dep = array(
-        /* .pub files are implied */
-        'dsa' => 'ssh_host_dsa_key',
-    );
-
-    $keys_all = array_merge($keys, $keys_dep);
+    ];
 
     /* Check for all needed key files. If any are missing, the keys need to be regenerated. */
     $generate_keys = false;
@@ -191,7 +184,7 @@ function openssh_configure_do($verbose = false, $interface = '')
         $sshconf .= "PasswordAuthentication no\n";
     }
 
-    foreach ($keys_all as $name) {
+    foreach ($keys as $name) {
         $file = "/conf/sshd/{$name}";
         if (!file_exists($file)) {
             continue;