summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-04-04 01:58:48 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-04-04 01:58:48 +0000
commit9323d964791a8627c7733e64951d32e7d4b19f9c (patch)
treea3ff269c6fcbe8123077a783311b5696a8ba83bb
parent20d7c7b02c92c28007dba8b08e617a415146d1df (diff)
- todd@cvs.openbsd.org 2001/04/03 21:19:38
[ssh_config] id_rsa1/2 -> id_rsa; ok markus@
-rw-r--r--ChangeLog5
-rw-r--r--ssh_config5
2 files changed, 6 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 0a84a525..6c370163 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,9 @@
[dh.c dh.h kex.c kex.h sshconnect2.c sshd.c]
move kex to kex*.c, used dispatch_set() callbacks for kex. should
make rekeying easier.
+ - todd@cvs.openbsd.org 2001/04/03 21:19:38
+ [ssh_config]
+ id_rsa1/2 -> id_rsa; ok markus@
20010403
- OpenBSD CVS Sync
@@ -4820,4 +4823,4 @@
- Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1
-$Id: ChangeLog,v 1.1050 2001/04/04 01:56:17 mouring Exp $
+$Id: ChangeLog,v 1.1051 2001/04/04 01:58:48 mouring Exp $
diff --git a/ssh_config b/ssh_config
index e3faa770..62093545 100644
--- a/ssh_config
+++ b/ssh_config
@@ -1,4 +1,4 @@
-# $OpenBSD: ssh_config,v 1.9 2001/03/10 12:53:51 deraadt Exp $
+# $OpenBSD: ssh_config,v 1.10 2001/04/03 21:19:38 todd Exp $
# This is ssh client systemwide configuration file. See ssh(1) for more
# information. This file provides defaults for users, and the values can
@@ -28,8 +28,7 @@
# StrictHostKeyChecking yes
# IdentityFile ~/.ssh/identity
# IdentityFile ~/.ssh/id_dsa
-# IdentityFile ~/.ssh/id_rsa1
-# IdentityFile ~/.ssh/id_rsa2
+# IdentityFile ~/.ssh/id_rsa
# Port 22
# Protocol 2,1
# Cipher blowfish