[openssh-commits] [openssh] 06/09: upstream: Wrap XMSS including in ifdef. Patch from markus at

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit 99043bd64e5e0f427173f4fa83ef25a4676624a3
Author: dtucker at openbsd.org <dtucker at openbsd.org>
Date:   Fri May 3 03:25:18 2019 +0000

    upstream: Wrap XMSS including in ifdef. Patch from markus at
    
    blueflash.cc, ok djm
    
    OpenBSD-Commit-ID: e3b34fc35cf12d33bde91ac03633210a3bc0f8b5
---
 sshkey.c | 6 ++++--
 1 file 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"
 

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.