summaryrefslogtreecommitdiff
path: root/sshkey.c
diff options
context:
space:
mode:
authordtucker@openbsd.org <dtucker@openbsd.org>2019-05-03 03:25:18 +0000
committerDamien Miller <djm@mindrot.org>2019-05-08 18:42:43 +1000
commit99043bd64e5e0f427173f4fa83ef25a4676624a3 (patch)
tree536ae01baf0d5878030978404016a283e59c9b45 /sshkey.c
parent8fcfb7789c43a19d24162a7a4055cd09ee951b34 (diff)
upstream: Wrap XMSS including in ifdef. Patch from markus at
blueflash.cc, ok djm OpenBSD-Commit-ID: e3b34fc35cf12d33bde91ac03633210a3bc0f8b5
Diffstat (limited to 'sshkey.c')
-rw-r--r--sshkey.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/sshkey.c b/sshkey.c
index ad195776..9849cb23 100644
--- a/sshkey.c
+++ b/sshkey.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshkey.c,v 1.73 2019/01/21 09:54:11 djm Exp $ */
+/* $OpenBSD: sshkey.c,v 1.74 2019/05/03 03:25:18 dtucker Exp $ */
/*
* Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
* Copyright (c) 2008 Alexander von Gernler. All rights reserved.
@@ -55,10 +55,12 @@
#include "digest.h"
#define SSHKEY_INTERNAL
#include "sshkey.h"
-#include "sshkey-xmss.h"
#include "match.h"
+#ifdef WITH_XMSS
+#include "sshkey-xmss.h"
#include "xmss_fast.h"
+#endif
#include "openbsd-compat/openssl-compat.h"