[src/trunk]: src/crypto/external/bsd/openssh/dist Disable loading XMSS keys b...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d1703dd2c21c
branches:  trunk
changeset: 833065:d1703dd2c21c
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Thu Jun 07 15:26:09 2018 +0000

description:
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.

diffstat:

 crypto/external/bsd/openssh/dist/servconf.c |  8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

diffs (29 lines):

diff -r d52c83719164 -r d1703dd2c21c crypto/external/bsd/openssh/dist/servconf.c
--- a/crypto/external/bsd/openssh/dist/servconf.c       Thu Jun 07 13:36:28 2018 +0000
+++ b/crypto/external/bsd/openssh/dist/servconf.c       Thu Jun 07 15:26:09 2018 +0000
@@ -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 @@
                    _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)