Remove RSA1 host key generation.

SSH1 support is now gone, remove SSH1 key generation.
Patch from eb at emlix.com.

2 files changed, 0 insertions, 18 deletions

diff --git a/contrib/redhat/sshd.init b/contrib/redhat/sshd.init
index 40c8dfd9f..8ee5fcd3b 100755
--- a/contrib/redhat/sshd.init
+++ b/contrib/redhat/sshd.init
@@ -40,7 +40,6 @@ start()
         # Create keys if necessary
         /usr/bin/ssh-keygen -A
         if [ -x /sbin/restorecon ]; then
-                /sbin/restorecon /etc/ssh/ssh_host_key.pub
                 /sbin/restorecon /etc/ssh/ssh_host_rsa_key.pub
                 /sbin/restorecon /etc/ssh/ssh_host_dsa_key.pub
                 /sbin/restorecon /etc/ssh/ssh_host_ecdsa_key.pub
diff --git a/contrib/redhat/sshd.init.old b/contrib/redhat/sshd.init.old
index 0deb6080e..8a30f7da4 100755
--- a/contrib/redhat/sshd.init.old
+++ b/contrib/redhat/sshd.init.old
@@ -24,7 +24,6 @@ prog="sshd"
 # Some functions to make the below more readable
 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
 PID_FILE=/var/run/sshd.pid
@@ -61,21 +60,6 @@ my_failure() {
     ;;
   esac
 }
-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
-                        my_success "RSA1 key generation"
-                        echo
-                else
-                        my_failure "RSA1 key generation"
-                        echo
-                        exit 1
-                fi
-        fi
-}
 do_rsa_keygen() {
         if [ ! -s $RSA_KEY ]; then
                 echo -n "Generating SSH2 RSA host key: "
@@ -119,7 +103,6 @@ do_restart_sanity_check() {
 case "$1" in
         start)
                 # Create keys if necessary
-                do_rsa1_keygen;
                 do_rsa_keygen;
                 do_dsa_keygen;