diff options
author | Damien Miller <djm@mindrot.org> | 2013-12-18 17:49:48 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2013-12-18 17:49:48 +1100 |
commit | 059321d19af24d87420de3193f79dfab23556078 (patch) | |
tree | 84ae5e1ddb78c40f5193b11e40feaa4ca9e1ebc9 | |
parent | 155b5a5bf158767f989215479ded2a57f331e1c6 (diff) |
- pascal@cvs.openbsd.org 2013/12/15 18:17:26
[ssh-add.c]
Make ssh-add also add .ssh/id_ed25519; fixes lie in manual page.
ok markus@
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | ssh-add.c | 3 |
2 files changed, 6 insertions, 1 deletions
@@ -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 | ||
25 | 20131208 | 29 | 20131208 |
26 | - (djm) [openbsd-compat/bsd-setres_id.c] Missing header; from Corinna | 30 | - (djm) [openbsd-compat/bsd-setres_id.c] Missing header; from Corinna |
@@ -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 | }; |