2 files changed, 10 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 1dbd68c2d..b9afc1801 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -195,6 +195,9 @@
    - stevesk@cvs.openbsd.org 2002/01/16 17:42:33
      [ssh.1]
      correct defaults for -i/IdentityFile; ok markus@
+   - stevesk@cvs.openbsd.org 2002/01/16 17:55:33
+     [ssh_config]
+     correct some commented defaults.  add Ciphers default.  ok markus@
 
 20020121
  - (djm) Rework ssh-rand-helper:
@@ -7342,4 +7345,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1777 2002/01/22 12:32:26 djm Exp $
+$Id: ChangeLog,v 1.1778 2002/01/22 12:32:39 djm Exp $
diff --git a/ssh_config b/ssh_config
index 7d1b21067..a8a8d72ab 100644
--- a/ssh_config
+++ b/ssh_config
@@ -1,4 +1,4 @@
-#       $OpenBSD: ssh_config,v 1.11 2002/01/03 04:11:08 stevesk Exp $
+#       $OpenBSD: ssh_config,v 1.12 2002/01/16 17:55:33 stevesk Exp $
 
 # This is the ssh client system-wide configuration file.  See ssh(1)
 # for more information.  This file provides defaults for users, and
@@ -18,7 +18,7 @@
 # Host *
 #   ForwardAgent no
 #   ForwardX11 no
-#   RhostsAuthentication no
+#   RhostsAuthentication yes
 #   RhostsRSAAuthentication yes
 #   RSAAuthentication yes
 #   PasswordAuthentication yes
@@ -26,11 +26,12 @@
 #   UseRsh no
 #   BatchMode no
 #   CheckHostIP yes
-#   StrictHostKeyChecking yes
+#   StrictHostKeyChecking ask
 #   IdentityFile ~/.ssh/identity
-#   IdentityFile ~/.ssh/id_dsa
 #   IdentityFile ~/.ssh/id_rsa
+#   IdentityFile ~/.ssh/id_dsa
 #   Port 22
 #   Protocol 2,1
-#   Cipher blowfish
+#   Cipher 3des
+#   Ciphers aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour,aes192-cbc,aes256-cbc
 #   EscapeChar ~