Conditionally compile XMSS code.

The XMSS code is currently experimental and, unlike the rest of OpenSSH
cannot currently be compiled with a c89 compiler.
This commit is contained in:
Darren Tucker 2018-02-27 14:45:17 +11:00
parent 146c3bd28c
commit a10d8552d0
11 changed files with 22 additions and 3 deletions

View File

@ -1,3 +1,4 @@
#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.
@ -1051,3 +1052,4 @@ sshkey_xmss_enable_maxsign(struct sshkey *k, u_int32_t maxsign)
state->maxidx = state->idx + maxsign; state->maxidx = state->idx + maxsign;
return 0; return 0;
} }
#endif /* WITH_XMSS */

View File

@ -1,3 +1,4 @@
#ifdef WITH_XMSS
/* /*
xmss_commons.c 20160722 xmss_commons.c 20160722
Andreas Hülsing Andreas Hülsing
@ -31,3 +32,4 @@ void hexdump(const unsigned char *a, size_t len)
printf("%02x", a[i]); printf("%02x", a[i]);
} }
#endif #endif
#endif /* WITH_XMSS */

View File

@ -1,3 +1,4 @@
#ifdef WITH_XMSS
/* /*
xmss_commons.h 20160722 xmss_commons.h 20160722
Andreas Hülsing Andreas Hülsing
@ -17,3 +18,4 @@ void to_byte(unsigned char *output, unsigned long long in, uint32_t bytes);
void hexdump(const unsigned char *a, size_t len); void hexdump(const unsigned char *a, size_t len);
#endif #endif
#endif #endif
#endif /* WITH_XMSS */

View File

@ -1,3 +1,4 @@
#ifdef WITH_XMSS
/* /*
xmss_fast.c version 20160722 xmss_fast.c version 20160722
Andreas Hülsing Andreas Hülsing
@ -1101,3 +1102,4 @@ fail:
*msglen = -1; *msglen = -1;
return -1; return -1;
} }
#endif /* WITH_XMSS */

View File

@ -1,3 +1,4 @@
#ifdef WITH_XMSS
/* /*
xmss_fast.h version 20160722 xmss_fast.h version 20160722
Andreas Hülsing Andreas Hülsing
@ -106,4 +107,4 @@ int xmssmt_sign(unsigned char *sk, bds_state *state, unsigned char *wots_sigs, u
*/ */
int xmssmt_sign_open(unsigned char *msg, unsigned long long *msglen, const unsigned char *sig_msg, unsigned long long sig_msg_len, const unsigned char *pk, const xmssmt_params *params); int xmssmt_sign_open(unsigned char *msg, unsigned long long *msglen, const unsigned char *sig_msg, unsigned long long sig_msg_len, const unsigned char *pk, const xmssmt_params *params);
#endif #endif
#endif /* WITH_XMSS */

View File

@ -1,3 +1,4 @@
#ifdef WITH_XMSS
/* /*
hash.c version 20160722 hash.c version 20160722
Andreas Hülsing Andreas Hülsing
@ -135,3 +136,4 @@ int hash_f(unsigned char *out, const unsigned char *in, const unsigned char *pub
} }
return core_hash_SHA2(out, 0, key, n, buf, n, n); return core_hash_SHA2(out, 0, key, n, buf, n, n);
} }
#endif /* WITH_XMSS */

View File

@ -1,3 +1,4 @@
#ifdef WITH_XMSS
/* /*
hash.h version 20160722 hash.h version 20160722
Andreas Hülsing Andreas Hülsing
@ -17,3 +18,4 @@ int hash_h(unsigned char *out, const unsigned char *in, const unsigned char *pub
int hash_f(unsigned char *out, const unsigned char *in, const unsigned char *pub_seed, uint32_t addr[8], const unsigned int n); int hash_f(unsigned char *out, const unsigned char *in, const unsigned char *pub_seed, uint32_t addr[8], const unsigned int n);
#endif #endif
#endif /* WITH_XMSS */

View File

@ -1,3 +1,4 @@
#ifdef WITH_XMSS
/* /*
hash_address.c version 20160722 hash_address.c version 20160722
Andreas Hülsing Andreas Hülsing
@ -61,3 +62,4 @@ void setTreeHeight(uint32_t adrs[8], uint32_t treeHeight){
void setTreeIndex(uint32_t adrs[8], uint32_t treeIndex){ void setTreeIndex(uint32_t adrs[8], uint32_t treeIndex){
adrs[6] = treeIndex; adrs[6] = treeIndex;
} }
#endif /* WITH_XMSS */

View File

@ -1,3 +1,4 @@
#ifdef WITH_XMSS
/* /*
hash_address.h version 20160722 hash_address.h version 20160722
Andreas Hülsing Andreas Hülsing
@ -35,5 +36,4 @@ void setTreeHeight(uint32_t adrs[8], uint32_t treeHeight);
void setTreeIndex(uint32_t adrs[8], uint32_t treeIndex); void setTreeIndex(uint32_t adrs[8], uint32_t treeIndex);
#endif /* WITH_XMSS */

View File

@ -1,3 +1,4 @@
#ifdef WITH_XMSS
/* /*
wots.c version 20160722 wots.c version 20160722
Andreas Hülsing Andreas Hülsing
@ -187,3 +188,4 @@ int wots_pkFromSig(unsigned char *pk, const unsigned char *sig, const unsigned c
free(basew); free(basew);
return 0; return 0;
} }
#endif /* WITH_XMSS */

View File

@ -1,3 +1,4 @@
#ifdef WITH_XMSS
/* /*
wots.h version 20160722 wots.h version 20160722
Andreas Hülsing Andreas Hülsing
@ -59,3 +60,4 @@ int wots_sign(unsigned char *sig, const unsigned char *msg, const unsigned char
int wots_pkFromSig(unsigned char *pk, const unsigned char *sig, const unsigned char *msg, const wots_params *params, const unsigned char *pub_seed, uint32_t addr[8]); int wots_pkFromSig(unsigned char *pk, const unsigned char *sig, const unsigned char *msg, const wots_params *params, const unsigned char *pub_seed, uint32_t addr[8]);
#endif #endif
#endif /* WITH_XMSS */