[rhel6-branch] Drop support for ssh protocol version 1 (#1004752)

Brian C. Lane bcl at redhat.com
Mon Sep 9 16:07:39 UTC 2013


From: "Brian C. Lane" <bcl at redhat.com>

In fips mode creation of the protocol 1 key causes it to hang. This
removes version 1 support during installation. It has no effect on the
installed system.
---
 anaconda          | 1 -
 scripts/mk-images | 5 -----
 2 files changed, 6 deletions(-)

diff --git a/anaconda b/anaconda
index 0e566f3..09d11c2 100755
--- a/anaconda
+++ b/anaconda
@@ -459,7 +459,6 @@ def startSsh():
     if not fork_orphan():
         os.open("/var/log/lastlog", os.O_RDWR | os.O_CREAT, 0644)
         ssh_keys = {
-            'rsa1':'ssh_host_key',
             'rsa':'ssh_host_rsa_key',
             'dsa':'ssh_host_dsa_key',
             }
diff --git a/scripts/mk-images b/scripts/mk-images
index eb2b26a..2439002 100755
--- a/scripts/mk-images
+++ b/scripts/mk-images
@@ -475,10 +475,6 @@ EOF
         # key generation takes ages on s390, you really don't want this
         # for every installation attempt. These are NOT the keys of the
         # installed system!
-        echo -n "Generating SSH1 RSA host key: "
-        /usr/bin/ssh-keygen -q -t rsa1 -f $MBD_DIR/etc/ssh/ssh_host_key \
-                            -C '' -N '' >&/dev/null
-        echo
         echo -n "Generating SSH2 RSA host key: "
         /usr/bin/ssh-keygen -q -t rsa -f $MBD_DIR/etc/ssh/ssh_host_rsa_key \
                             -C '' -N '' >&/dev/null
@@ -494,7 +490,6 @@ EOF
 
     cat > $MBD_DIR/etc/ssh/sshd_config.anaconda <<EOF
 Port 22
-HostKey /etc/ssh/ssh_host_key
 HostKey /etc/ssh/ssh_host_rsa_key
 HostKey /etc/ssh/ssh_host_dsa_key
 PermitRootLogin yes
-- 
1.8.3.1



More information about the anaconda-patches mailing list