- deraadt@cvs.openbsd.org 2001/03/10 12:53:51

     [readconf.c ssh_config]
     default to SSH2, now that m68k runs fast

diff --git a/ChangeLog b/ChangeLog
index 1b3bc696844040dc3fc8948460626fdde4f9ada3..256eea97e6fe1766482fafc7da73d2a8fcf1098b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
    - markus@cvs.openbsd.org 2001/03/10 12:48:27
      [sshconnect2.c]
      ignore nonexisting private keys; report rjmooney@mediaone.net
+   - deraadt@cvs.openbsd.org 2001/03/10 12:53:51
+     [readconf.c ssh_config]
+     default to SSH2, now that m68k runs fast
 
 20010310
  - OpenBSD CVS Sync

diff --git a/readconf.c b/readconf.c
index 948d7eddf7ddb9596528aabc6d68947b0d14ca9b..2b29814763cf00af3f6d8f70ddd1f77888dfae2c 100644 (file)
--- a/readconf.c
+++ b/readconf.c
@@ -12,7 +12,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: readconf.c,v 1.65 2001/03/08 00:15:47 markus Exp $");
+RCSID("$OpenBSD: readconf.c,v 1.66 2001/03/10 12:53:52 deraadt Exp $");
 
 #include "ssh.h"
 #include "xmalloc.h"
@@ -798,7 +798,7 @@ fill_default_options(Options * options)
        /* options->ciphers, default set in myproposals.h */
        /* options->macs, default set in myproposals.h */
        if (options->protocol == SSH_PROTO_UNKNOWN)
-               options->protocol = SSH_PROTO_1|SSH_PROTO_2|SSH_PROTO_1_PREFERRED;
+               options->protocol = SSH_PROTO_1|SSH_PROTO_2;
        if (options->num_identity_files == 0) {
                if (options->protocol & SSH_PROTO_1) {
                        len = 2 + strlen(_PATH_SSH_CLIENT_IDENTITY) + 1;

diff --git a/ssh_config b/ssh_config
index cfaf2313f849dabfcaf772aa57184acba8a751b9..e3faa7709139da047f62789fa9c28b5027244dc1 100644 (file)
--- a/ssh_config
+++ b/ssh_config
@@ -1,4 +1,4 @@
-#      $OpenBSD: ssh_config,v 1.8 2001/02/02 12:57:51 deraadt Exp $
+#      $OpenBSD: ssh_config,v 1.9 2001/03/10 12:53:51 deraadt Exp $
 
 # This is ssh client systemwide configuration file.  See ssh(1) for more
 # information.  This file provides defaults for users, and the values can
@@ -31,6 +31,6 @@
 #   IdentityFile ~/.ssh/id_rsa1
 #   IdentityFile ~/.ssh/id_rsa2
 #   Port 22
-#   Protocol 1,2
+#   Protocol 2,1
 #   Cipher blowfish
 #   EscapeChar ~