RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2024-12-22 10:00:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add WITH_XMSS, move to prevent conflicts.

Browse Source 
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.
This commit is contained in:
Darren Tucker 2018-02-28 19:59:35 +11:00
parent a10d8552d0
commit 941e0d3e9b
7 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ssh-xmss.c
View File

@ -16,6 +16,7 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
#include "includes.h" #include "includes.h"
#ifdef WITH_XMSS
#define SSHKEY_INTERNAL #define SSHKEY_INTERNAL
#include <sys/types.h> #include <sys/types.h>
@ -188,3 +189,4 @@ ssh_xmss_verify(const struct sshkey *key,
free(ktype); free(ktype);
return r; return r;
} }
#endif /* WITH_XMSS */

2
sshkey-xmss.c
View File

@ -1,4 +1,3 @@
#ifdef WITH_XMSS
/* $OpenBSD: sshkey-xmss.c,v 1.1 2018/02/23 15:58:38 markus Exp $ */ /* $OpenBSD: sshkey-xmss.c,v 1.1 2018/02/23 15:58:38 markus Exp $ */
/* /*
* Copyright (c) 2017 Markus Friedl. All rights reserved. * Copyright (c) 2017 Markus Friedl. All rights reserved.
@ -25,6 +24,7 @@
*/ */
#include "includes.h" #include "includes.h"
#ifdef WITH_XMSS
#include <sys/types.h> #include <sys/types.h>
#include <sys/uio.h> #include <sys/uio.h>

2
xmss_commons.c
View File

@ -1,4 +1,3 @@
#ifdef WITH_XMSS
/* /*
xmss_commons.c 20160722 xmss_commons.c 20160722
Andreas Hülsing Andreas Hülsing
@ -7,6 +6,7 @@ Public domain.
*/ */
#include "includes.h" #include "includes.h"
#ifdef WITH_XMSS
#include "xmss_commons.h" #include "xmss_commons.h"
#include <stdlib.h> #include <stdlib.h>

2
xmss_fast.c
View File

@ -1,4 +1,3 @@
#ifdef WITH_XMSS
/* /*
xmss_fast.c version 20160722 xmss_fast.c version 20160722
Andreas Hülsing Andreas Hülsing
@ -7,6 +6,7 @@ Public domain.
*/ */
#include "includes.h" #include "includes.h"
#ifdef WITH_XMSS
#include "xmss_fast.h" #include "xmss_fast.h"
#include <stdlib.h> #include <stdlib.h>

2
xmss_hash.c
View File

@ -1,4 +1,3 @@
#ifdef WITH_XMSS
/* /*
hash.c version 20160722 hash.c version 20160722
Andreas Hülsing Andreas Hülsing
@ -7,6 +6,7 @@ Public domain.
*/ */
#include "includes.h" #include "includes.h"
#ifdef WITH_XMSS
#include "xmss_hash_address.h" #include "xmss_hash_address.h"
#include "xmss_commons.h" #include "xmss_commons.h"

2
xmss_hash_address.c
View File

@ -1,4 +1,3 @@
#ifdef WITH_XMSS
/* /*
hash_address.c version 20160722 hash_address.c version 20160722
Andreas Hülsing Andreas Hülsing
@ -6,6 +5,7 @@ Joost Rijneveld
Public domain. Public domain.
*/ */
#include "includes.h" #include "includes.h"
#ifdef WITH_XMSS
#ifdef HAVE_STDINT_H #ifdef HAVE_STDINT_H
#include <stdint.h> #include <stdint.h>

2
xmss_wots.c
View File

@ -1,4 +1,3 @@
#ifdef WITH_XMSS
/* /*
wots.c version 20160722 wots.c version 20160722
Andreas Hülsing Andreas Hülsing
@ -7,6 +6,7 @@ Public domain.
*/ */
#include "includes.h" #include "includes.h"
#ifdef WITH_XMSS
#include <stdlib.h> #include <stdlib.h>
#ifdef HAVE_STDINT_H #ifdef HAVE_STDINT_H