* Tue Mar 26 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-3.sme

- remove RSA1 support which prevents service start [SME: 12553]

root/etc/e-smith/templates/etc/ssh/sshd_config/20HostKey

@@ -1 +0,0 @@
-HostKey /etc/ssh/ssh_host_key

root/etc/e-smith/templates/etc/ssh/sshd_config/20HostKeyED25519

@@ -1,2 +1 @@
 HostKey /etc/ssh/ssh_host_ed25519_key
-

root/etc/e-smith/templates/etc/ssh/sshd_config/20HostKeyRSA

@@ -1 +1,2 @@
 HostKey /etc/ssh/ssh_host_rsa_key
+

root/sbin/e-smith/systemd/sshd-prepare

@@ -4,28 +4,11 @@
 # initscript.
 KEYGEN=/usr/bin/ssh-keygen
 SSHD=/usr/sbin/sshd
-RSA1_KEY=/etc/ssh/ssh_host_key
 RSA_KEY=/etc/ssh/ssh_host_rsa_key
 DSA_KEY=/etc/ssh/ssh_host_dsa_key
 ECDSA_KEY=/etc/ssh/ssh_host_ecdsa_key
 ED25519_KEY=/etc/ssh/ssh_host_ed25519_key
 
-do_rsa1_keygen() {
-    if [ ! -s $RSA1_KEY ]; then
-        echo -n $"Generating SSH1 RSA host key: "
-        if $KEYGEN -q -t rsa1 -f $RSA1_KEY -C '' -N '' >&/dev/null; then
-            chmod 600 $RSA1_KEY
-            chmod 644 $RSA1_KEY.pub
-            echo "Success: RSA1 key generation"
-            echo
-        else
-            echo "Failure: RSA1 key generation"
-            echo
-            exit 1
-        fi
-    fi
-}
-
 do_rsa_keygen() {
     if [ ! -s $RSA_KEY ]; then
         echo -n $"Generating SSH2 RSA host key: "
@@ -89,7 +72,6 @@ do_ed25519_keygen() {
     fi
 }
 
-do_rsa1_keygen
 do_rsa_keygen
 do_dsa_keygen
 do_ecdsa_keygen

smeserver-openssh.spec

@@ -4,7 +4,7 @@ Summary: smeserver module to configure and enable ssh
 %define name smeserver-openssh
 Name: %{name}
 %define version 11.0.0
-%define release 1
+%define release 3
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -12,18 +12,24 @@ Group: Networking/Daemons
 Source: %{name}-%{version}.tar.xz
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
-BuildRequires: e-smith-devtools
+BuildRequires: smeserver-devtools
 BuildArchitectures: noarch
-Requires: e-smith, openssl, 
+Requires: smeserver, openssl, 
 Requires: openssh >= 3.5
 Requires: openssh-clients
 Requires: openssh-server
-Requires: e-smith-lib >= 1.15.1-19
+Requires: smeserver-lib >= 1.15.1-19
 Requires: runit
 Provides: e-smith-openssh
 AutoReqProv: no
 
 %changelog
+* Tue Mar 26 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-3.sme
+- remove RSA1 support which prevents service start [SME: 12553]
+
+* Sat Mar 23 2024 Brian Read <brianr@koozali.org>11.0.0-2.sme
+- Change Requires: e-smith- to Requires:smeserver-
+
 * Sat Mar 23 2024 Brian Read <brianr@koozali.org>11.0.0-1.sme
 - Update Release and Version to base version and 1st release for SME11 [SME: 12518]
 - Move Provides: from after Changelog