From b0920f7a133eb44463f9602dbabdff3582da6260 Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Sat, 6 Jan 2024 08:15:55 +0100
Subject: [PATCH] sshd-makecerts: RSA1 (ssh 1) is no longer supported causing
 sshd startup error [release 7.1p1-2mamba;Sat Oct 10 2015]

---
 openssh-sshd-makecerts | 29 ++++++++++++++---------------
 openssh.spec           |  5 ++++-
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/openssh-sshd-makecerts b/openssh-sshd-makecerts
index 2e1efec..55b2a90 100644
--- a/openssh-sshd-makecerts
+++ b/openssh-sshd-makecerts
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-RSA1_KEY=/etc/ssh/ssh_host_key
+#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
@@ -8,19 +8,19 @@ ED25519_KEY=/etc/ssh/ssh_host_ed25519_key
 
 KEYGEN=/usr/bin/ssh-keygen
 
-function 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
-      else
-         echo $"RSA1 key generation failed!"
-         exit 1
-      fi
-   fi
-}
+#function 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
+#      else
+#         echo $"RSA1 key generation failed!"
+#         exit 1
+#      fi
+#   fi
+#}
 
 function do_rsa_keygen
 {
@@ -80,7 +80,6 @@ function do_ed25519_keygen
 
 # Create keys if necessary
 do_rsa_keygen
-do_rsa1_keygen
 do_dsa_keygen
 do_ecdsa_keygen
 do_ed25519_keygen
diff --git a/openssh.spec b/openssh.spec
index 64965a5..33cb010 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -7,7 +7,7 @@
 
 Name:          openssh
 Version:       7.1p1
-Release:       1mamba
+Release:       2mamba
 Summary:       OpenSSH free Secure Shell (SSH) implementation
 Group:         Network/Security
 Vendor:        openmamba
@@ -292,6 +292,9 @@ exit 0
 %{_libexecdir}/openssh/ssh-askpass
 
 %changelog
+* Sat Oct 10 2015 Silvan Calarco <silvan.calarco@mambasoft.it> 7.1p1-2mamba
+- sshd-makecerts: RSA1 (ssh 1) is no longer supported causing sshd startup error
+
 * Fri Aug 21 2015 Automatic Build System <autodist@mambasoft.it> 7.1p1-1mamba
 - automatic version update by autodist