merge 5.7p1

1 files changed, 3 insertions, 1 deletions

diff --git a/pathnames.h b/pathnames.h
index 9e50950fe..e2dd49a9b 100644
--- a/pathnames.h
+++ b/pathnames.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pathnames.h,v 1.19 2010/02/11 20:37:47 djm Exp $ */
+/* $OpenBSD: pathnames.h,v 1.20 2010/08/31 11:54:45 djm Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -38,6 +38,7 @@
 #define _PATH_HOST_CONFIG_FILE          SSHDIR "/ssh_config"
 #define _PATH_HOST_KEY_FILE             SSHDIR "/ssh_host_key"
 #define _PATH_HOST_DSA_KEY_FILE         SSHDIR "/ssh_host_dsa_key"
+#define _PATH_HOST_ECDSA_KEY_FILE       SSHDIR "/ssh_host_ecdsa_key"
 #define _PATH_HOST_RSA_KEY_FILE         SSHDIR "/ssh_host_rsa_key"
 #define _PATH_DH_MODULI                 SSHDIR "/moduli"
 /* Backwards compatibility */
@@ -74,6 +75,7 @@
  */
 #define _PATH_SSH_CLIENT_IDENTITY       ".ssh/identity"
 #define _PATH_SSH_CLIENT_ID_DSA         ".ssh/id_dsa"
+#define _PATH_SSH_CLIENT_ID_ECDSA       ".ssh/id_ecdsa"
 #define _PATH_SSH_CLIENT_ID_RSA         ".ssh/id_rsa"
 
 /*