summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--ssh-add.c3
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c019c0e83..29555355f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,6 +21,10 @@
21 - markus@cvs.openbsd.org 2013/12/09 11:08:17 21 - markus@cvs.openbsd.org 2013/12/09 11:08:17
22 [crypto_api.h] 22 [crypto_api.h]
23 remove unused defines 23 remove unused defines
24 - pascal@cvs.openbsd.org 2013/12/15 18:17:26
25 [ssh-add.c]
26 Make ssh-add also add .ssh/id_ed25519; fixes lie in manual page.
27 ok markus@
24 28
2520131208 2920131208
26 - (djm) [openbsd-compat/bsd-setres_id.c] Missing header; from Corinna 30 - (djm) [openbsd-compat/bsd-setres_id.c] Missing header; from Corinna
diff --git a/ssh-add.c b/ssh-add.c
index 5e8166f66..896584482 100644
--- a/ssh-add.c
+++ b/ssh-add.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-add.c,v 1.106 2013/05/17 00:13:14 djm Exp $ */ 1/* $OpenBSD: ssh-add.c,v 1.107 2013/12/15 18:17:26 pascal Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -73,6 +73,7 @@ static char *default_files[] = {
73#ifdef OPENSSL_HAS_ECC 73#ifdef OPENSSL_HAS_ECC
74 _PATH_SSH_CLIENT_ID_ECDSA, 74 _PATH_SSH_CLIENT_ID_ECDSA,
75#endif 75#endif
76 _PATH_SSH_CLIENT_ID_ED25519,
76 _PATH_SSH_CLIENT_IDENTITY, 77 _PATH_SSH_CLIENT_IDENTITY,
77 NULL 78 NULL
78}; 79};