1 files changed, 10 insertions, 2 deletions

diff --git a/ssh-keyscan.c b/ssh-keyscan.c
index 15059f6fa..535368602 100644
--- a/ssh-keyscan.c
+++ b/ssh-keyscan.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keyscan.c,v 1.117 2018/02/23 05:14:05 djm Exp $ */
+/* $OpenBSD: ssh-keyscan.c,v 1.118 2018/02/23 15:58:38 markus Exp $ */
 /*
  * Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>.
  *
@@ -58,9 +58,10 @@ int ssh_port = SSH_DEFAULT_PORT;
 #define KT_RSA          (1<<1)
 #define KT_ECDSA        (1<<2)
 #define KT_ED25519      (1<<3)
+#define KT_XMSS         (1<<4)
 
 #define KT_MIN          KT_DSA
-#define KT_MAX          KT_ED25519
+#define KT_MAX          KT_XMSS
 
 int get_cert = 0;
 int get_keytypes = KT_RSA|KT_ECDSA|KT_ED25519;
@@ -238,6 +239,10 @@ keygrab_ssh2(con *c)
                 myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = get_cert ?
                     "ssh-ed25519-cert-v01@openssh.com" : "ssh-ed25519";
                 break;
+        case KT_XMSS:
+                myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = get_cert ?
+                    "ssh-xmss-cert-v01@openssh.com" : "ssh-xmss@openssh.com";
+                break;
         case KT_ECDSA:
                 myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = get_cert ?
                     "ecdsa-sha2-nistp256-cert-v01@openssh.com,"
@@ -718,6 +723,9 @@ main(int argc, char **argv)
                                 case KEY_ED25519:
                                         get_keytypes |= KT_ED25519;
                                         break;
+                                case KEY_XMSS:
+                                        get_keytypes |= KT_XMSS;
+                                        break;
                                 case KEY_UNSPEC:
                                 default:
                                         fatal("Unknown key type \"%s\"", tname);