summaryrefslogtreecommitdiff
path: root/readconf.c
diff options
context:
space:
mode:
authormarkus@openbsd.org <markus@openbsd.org>2019-11-12 19:33:08 +0000
committerDamien Miller <djm@mindrot.org>2019-11-13 08:54:09 +1100
commit2c55744a56de0ffc81fe445a1e7fc5cd308712b3 (patch)
tree349cdc436823354aca60031358a6030313b6002d /readconf.c
parentfd1a3b5e38721b1d69aae2d9de1a1d9155dfa5c7 (diff)
upstream: enable ed25519 support; ok djm
OpenBSD-Commit-ID: 1a399c5b3ef15bd8efb916110cf5a9e0b554ab7e
Diffstat (limited to 'readconf.c')
-rw-r--r--readconf.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/readconf.c b/readconf.c
index f18194580..3d99367c3 100644
--- a/readconf.c
+++ b/readconf.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: readconf.c,v 1.310 2019/10/31 21:18:28 djm Exp $ */ 1/* $OpenBSD: readconf.c,v 1.311 2019/11/12 19:33:08 markus 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
@@ -2055,6 +2055,8 @@ fill_default_options(Options * options)
2055#endif 2055#endif
2056 add_identity_file(options, "~/", 2056 add_identity_file(options, "~/",
2057 _PATH_SSH_CLIENT_ID_ED25519, 0); 2057 _PATH_SSH_CLIENT_ID_ED25519, 0);
2058 add_identity_file(options, "~/",
2059 _PATH_SSH_CLIENT_ID_ED25519_SK, 0);
2058 add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_XMSS, 0); 2060 add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_XMSS, 0);
2059 } 2061 }
2060 if (options->escape_char == -1) 2062 if (options->escape_char == -1)