diff options
author | markus@openbsd.org <markus@openbsd.org> | 2018-02-23 15:58:37 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2018-02-26 11:40:41 +1100 |
commit | 1b11ea7c58cd5c59838b5fa574cd456d6047b2d4 (patch) | |
tree | 7e96cb41b5234b9d327f7c8f41392f09aed0994e /servconf.c | |
parent | 7d330a1ac02076de98cfc8fda05353d57b603755 (diff) |
upstream: 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@
OpenBSD-Commit-ID: ef3eccb96762a5d6f135d7daeef608df7776a7ac
Diffstat (limited to 'servconf.c')
-rw-r--r-- | servconf.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/servconf.c b/servconf.c index bf8ad671d..c87a9a2b6 100644 --- a/servconf.c +++ b/servconf.c | |||
@@ -1,5 +1,5 @@ | |||
1 | 1 | ||
2 | /* $OpenBSD: servconf.c,v 1.324 2018/02/16 02:32:40 djm Exp $ */ | 2 | /* $OpenBSD: servconf.c,v 1.325 2018/02/23 15:58:37 markus Exp $ */ |
3 | /* | 3 | /* |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
5 | * All rights reserved | 5 | * All rights reserved |
@@ -253,6 +253,8 @@ fill_default_server_options(ServerOptions *options) | |||
253 | #endif | 253 | #endif |
254 | servconf_add_hostkey("[default]", 0, options, | 254 | servconf_add_hostkey("[default]", 0, options, |
255 | _PATH_HOST_ED25519_KEY_FILE); | 255 | _PATH_HOST_ED25519_KEY_FILE); |
256 | servconf_add_hostkey("[default]", 0, options, | ||
257 | _PATH_HOST_XMSS_KEY_FILE); | ||
256 | } | 258 | } |
257 | /* No certificates by default */ | 259 | /* No certificates by default */ |
258 | if (options->num_ports == 0) | 260 | if (options->num_ports == 0) |