Module Name: src
Committed By: riastradh
Date: Thu Jun 7 15:26:09 UTC 2018
Modified Files:
src/crypto/external/bsd/openssh/dist: servconf.c
Log Message:
Disable loading XMSS keys by default too.
Nobody should be using XMSS host keys without an explicit decision,
because they're qualitatively different from all other types of host
keys in that they require keeping state.
This also eliminates a harmless but confusing warning that began
after we stopped generating XMSS keys by default.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/crypto/external/bsd/openssh/dist/servconf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssh/dist/servconf.c
diff -u src/crypto/external/bsd/openssh/dist/servconf.c:1.27 src/crypto/external/bsd/openssh/dist/servconf.c:1.28
--- src/crypto/external/bsd/openssh/dist/servconf.c:1.27 Sun Apr 8 21:56:48 2018
+++ src/crypto/external/bsd/openssh/dist/servconf.c Thu Jun 7 15:26:09 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: servconf.c,v 1.27 2018/04/08 21:56:48 joerg Exp $ */
+/* $NetBSD: servconf.c,v 1.28 2018/06/07 15:26:09 riastradh Exp $ */
/* $OpenBSD: servconf.c,v 1.326 2018/03/01 20:32:16 markus Exp $ */
/*
@@ -13,7 +13,7 @@
*/
#include "includes.h"
-__RCSID("$NetBSD: servconf.c,v 1.27 2018/04/08 21:56:48 joerg Exp $");
+__RCSID("$NetBSD: servconf.c,v 1.28 2018/06/07 15:26:09 riastradh Exp $");
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/queue.h>
@@ -294,10 +294,6 @@ fill_default_server_options(ServerOption
_PATH_HOST_ECDSA_KEY_FILE);
servconf_add_hostkey("[default]", 0, options,
_PATH_HOST_ED25519_KEY_FILE);
-#ifdef WITH_XMSS
- servconf_add_hostkey("[default]", 0, options,
- _PATH_HOST_XMSS_KEY_FILE);
-#endif /* WITH_XMSS */
}
/* No certificates by default */
if (options->num_ports == 0)
