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

- remove RSA1 support which prevents service start [SME: 12553]
This commit is contained in:
Jean-Philippe Pialasse 2024-03-26 11:52:28 -04:00
parent eee1cc4d06
commit 670c8fe1cc
5 changed files with 5 additions and 21 deletions

View File

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

View File

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

View File

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

View File

@ -4,28 +4,11 @@
# initscript. # initscript.
KEYGEN=/usr/bin/ssh-keygen KEYGEN=/usr/bin/ssh-keygen
SSHD=/usr/sbin/sshd SSHD=/usr/sbin/sshd
RSA1_KEY=/etc/ssh/ssh_host_key
RSA_KEY=/etc/ssh/ssh_host_rsa_key RSA_KEY=/etc/ssh/ssh_host_rsa_key
DSA_KEY=/etc/ssh/ssh_host_dsa_key DSA_KEY=/etc/ssh/ssh_host_dsa_key
ECDSA_KEY=/etc/ssh/ssh_host_ecdsa_key ECDSA_KEY=/etc/ssh/ssh_host_ecdsa_key
ED25519_KEY=/etc/ssh/ssh_host_ed25519_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() { do_rsa_keygen() {
if [ ! -s $RSA_KEY ]; then if [ ! -s $RSA_KEY ]; then
echo -n $"Generating SSH2 RSA host key: " echo -n $"Generating SSH2 RSA host key: "
@ -89,7 +72,6 @@ do_ed25519_keygen() {
fi fi
} }
do_rsa1_keygen
do_rsa_keygen do_rsa_keygen
do_dsa_keygen do_dsa_keygen
do_ecdsa_keygen do_ecdsa_keygen

View File

@ -4,7 +4,7 @@ Summary: smeserver module to configure and enable ssh
%define name smeserver-openssh %define name smeserver-openssh
Name: %{name} Name: %{name}
%define version 11.0.0 %define version 11.0.0
%define release 2 %define release 3
Version: %{version} Version: %{version}
Release: %{release}%{?dist} Release: %{release}%{?dist}
License: GPL License: GPL
@ -24,6 +24,9 @@ Provides: e-smith-openssh
AutoReqProv: no AutoReqProv: no
%changelog %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 * Sat Mar 23 2024 Brian Read <brianr@koozali.org>11.0.0-2.sme
- Change Requires: e-smith- to Requires:smeserver- - Change Requires: e-smith- to Requires:smeserver-