[openssh-commits] [openssh] 01/01: Add WITH_XMSS, move to prevent conflicts.

[git+noreply at mindrot.org]

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

dtucker pushed a commit to branch master
in repository openssh.

commit 941e0d3e9bb8d5e4eb70cc694441445faf037c84
Author: Darren Tucker <dtucker at dtucker.net>
Date:   Wed Feb 28 19:59:35 2018 +1100

    Add WITH_XMSS, move to prevent conflicts.
    
    Add #ifdef WITH_XMSS to ssh-xmss.c, move it in the other files to after
    includes.h so it's less likely to conflict and will pick up WITH_XMSS if
    added to config.h.
---
 ssh-xmss.c          | 2 ++
 sshkey-xmss.c       | 2 +-
 xmss_commons.c      | 2 +-
 xmss_fast.c         | 2 +-
 xmss_hash.c         | 2 +-
 xmss_hash_address.c | 2 +-
 xmss_wots.c         | 2 +-
 7 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/ssh-xmss.c b/ssh-xmss.c
index e25dbbf6..4c734fd7 100644
--- a/ssh-xmss.c
+++ b/ssh-xmss.c
@@ -16,6 +16,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #include "includes.h"
+#ifdef WITH_XMSS
 
 #define SSHKEY_INTERNAL
 #include <sys/types.h>
@@ -188,3 +189,4 @@ ssh_xmss_verify(const struct sshkey *key,
 	free(ktype);
 	return r;
 }
+#endif /* WITH_XMSS */
diff --git a/sshkey-xmss.c b/sshkey-xmss.c
index e2b7c49c..5d66ee79 100644
--- a/sshkey-xmss.c
+++ b/sshkey-xmss.c
@@ -1,4 +1,3 @@
-#ifdef WITH_XMSS
 /* $OpenBSD: sshkey-xmss.c,v 1.1 2018/02/23 15:58:38 markus Exp $ */
 /*
  * Copyright (c) 2017 Markus Friedl.  All rights reserved.
@@ -25,6 +24,7 @@
  */
 
 #include "includes.h"
+#ifdef WITH_XMSS
 
 #include <sys/types.h>
 #include <sys/uio.h>
diff --git a/xmss_commons.c b/xmss_commons.c
index a25fc673..18f648d6 100644
--- a/xmss_commons.c
+++ b/xmss_commons.c
@@ -1,4 +1,3 @@
-#ifdef WITH_XMSS
 /*
 xmss_commons.c 20160722
 Andreas Hülsing
@@ -7,6 +6,7 @@ Public domain.
 */
 
 #include "includes.h"
+#ifdef WITH_XMSS
 
 #include "xmss_commons.h"
 #include <stdlib.h>
diff --git a/xmss_fast.c b/xmss_fast.c
index 5e3a5431..577a9c3e 100644
--- a/xmss_fast.c
+++ b/xmss_fast.c
@@ -1,4 +1,3 @@
-#ifdef WITH_XMSS
 /*
 xmss_fast.c version 20160722
 Andreas Hülsing
@@ -7,6 +6,7 @@ Public domain.
 */
 
 #include "includes.h"
+#ifdef WITH_XMSS
 
 #include "xmss_fast.h"
 #include <stdlib.h>
diff --git a/xmss_hash.c b/xmss_hash.c
index c8b27116..f90e0560 100644
--- a/xmss_hash.c
+++ b/xmss_hash.c
@@ -1,4 +1,3 @@
-#ifdef WITH_XMSS
 /*
 hash.c version 20160722
 Andreas Hülsing
@@ -7,6 +6,7 @@ Public domain.
 */
 
 #include "includes.h"
+#ifdef WITH_XMSS
 
 #include "xmss_hash_address.h"
 #include "xmss_commons.h"
diff --git a/xmss_hash_address.c b/xmss_hash_address.c
index b970619e..21ae1033 100644
--- a/xmss_hash_address.c
+++ b/xmss_hash_address.c
@@ -1,4 +1,3 @@
-#ifdef WITH_XMSS
 /*
 hash_address.c version 20160722
 Andreas Hülsing
@@ -6,6 +5,7 @@ Joost Rijneveld
 Public domain.
 */
 #include "includes.h"
+#ifdef WITH_XMSS
 
 #ifdef HAVE_STDINT_H
 #include <stdint.h>
diff --git a/xmss_wots.c b/xmss_wots.c
index 8e0c07be..7767a656 100644
--- a/xmss_wots.c
+++ b/xmss_wots.c
@@ -1,4 +1,3 @@
-#ifdef WITH_XMSS
 /*
 wots.c version 20160722
 Andreas Hülsing
@@ -7,6 +6,7 @@ Public domain.
 */
 
 #include "includes.h"
+#ifdef WITH_XMSS
 
 #include <stdlib.h>
 #ifdef HAVE_STDINT_H

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