summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh/readconf.c
diff options
context:
space:
mode:
authormarkus <markus@openbsd.org>2018-02-23 15:58:37 +0000
committermarkus <markus@openbsd.org>2018-02-23 15:58:37 +0000
commita6be8e7c63a6251fb97b03b4d58d70655939876a (patch)
treeab23f1b6a9ec810f9e6bd2601cc73cd5e2ae3b4b /usr.bin/ssh/readconf.c
parentDrop redundant bzero() calls. ses_ghash is allocated with M_ZERO, so (diff)
downloadwireguard-openbsd-a6be8e7c63a6251fb97b03b4d58d70655939876a.tar.xz
wireguard-openbsd-a6be8e7c63a6251fb97b03b4d58d70655939876a.zip
Add experimental support for PQC XMSS keys (Extended Hash-Based Signatures)
The code is not compiled in by default (see WITH_XMSS in Makefile.inc) Joint work with stefan-lukas_gazdag at genua.eu See https://tools.ietf.org/html/draft-irtf-cfrg-xmss-hash-based-signatures-12 ok djm@
Diffstat (limited to 'usr.bin/ssh/readconf.c')
-rw-r--r--usr.bin/ssh/readconf.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/usr.bin/ssh/readconf.c b/usr.bin/ssh/readconf.c
index db4632dba9e..5d17b725600 100644
--- a/usr.bin/ssh/readconf.c
+++ b/usr.bin/ssh/readconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: readconf.c,v 1.282 2018/02/23 02:34:33 djm Exp $ */
+/* $OpenBSD: readconf.c,v 1.283 2018/02/23 15:58:37 markus Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1926,6 +1926,7 @@ fill_default_options(Options * options)
add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_ECDSA, 0);
add_identity_file(options, "~/",
_PATH_SSH_CLIENT_ID_ED25519, 0);
+ add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_XMSS, 0);
}
if (options->escape_char == -1)
options->escape_char = '~';