1 files changed, 4 insertions, 11 deletions

diff --git a/sshconnect1.c b/sshconnect1.c
index 2bb4d5387..ce560791c 100644
--- a/sshconnect1.c
+++ b/sshconnect1.c
@@ -13,7 +13,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshconnect1.c,v 1.6 2000/09/07 20:27:54 deraadt Exp $");
+RCSID("$OpenBSD: sshconnect1.c,v 1.8 2000/10/12 09:59:19 markus Exp $");
 
 #include <openssl/bn.h>
 #include <openssl/dsa.h>
@@ -25,7 +25,6 @@ RCSID("$OpenBSD: sshconnect1.c,v 1.6 2000/09/07 20:27:54 deraadt Exp $");
 #include "ssh.h"
 #include "buffer.h"
 #include "packet.h"
-#include "cipher.h"
 #include "mpaux.h"
 #include "uidswap.h"
 #include "readconf.h"
@@ -836,17 +835,11 @@ ssh_kex(char *host, struct sockaddr *hostaddr)
 
         if (options.cipher == SSH_CIPHER_ILLEGAL) {
                 log("No valid SSH1 cipher, using %.100s instead.",
-                    cipher_name(SSH_FALLBACK_CIPHER));
-                options.cipher = SSH_FALLBACK_CIPHER;
+                    cipher_name(ssh_cipher_default));
+                options.cipher = ssh_cipher_default;
         } else if (options.cipher == SSH_CIPHER_NOT_SET) {
-                if (cipher_mask1() & supported_ciphers & (1 << ssh_cipher_default))
+                if (cipher_mask_ssh1(1) & supported_ciphers & (1 << ssh_cipher_default))
                         options.cipher = ssh_cipher_default;
-                else {
-                        debug("Cipher %s not supported, using %.100s instead.",
-                            cipher_name(ssh_cipher_default),
-                            cipher_name(SSH_FALLBACK_CIPHER));
-                        options.cipher = SSH_FALLBACK_CIPHER;
-                }
         }
         /* Check that the selected cipher is supported. */
         if (!(supported_ciphers & (1 << options.cipher)))