Merge pull request #7868 from dgarske/pq_xms_lmss

Fixes for building wolfBoot sources for PQ LMS/XMSS
This commit is contained in:
Daniel Pouzzner
2024-08-14 23:28:12 -05:00
committed by GitHub
4 changed files with 10 additions and 14 deletions

View File

@ -27,7 +27,8 @@
#include <wolfssl/wolfcrypt/error-crypt.h>
#include <wolfssl/wolfcrypt/logging.h>
#ifdef WOLFSSL_HAVE_LMS
#if defined(WOLFSSL_HAVE_LMS) && defined(HAVE_LIBLMS)
#include <wolfssl/wolfcrypt/ext_lms.h>
#ifdef NO_INLINE
@ -1048,4 +1049,4 @@ int wc_LmsKey_Verify(LmsKey * key, const byte * sig, word32 sigSz,
return 0;
}
#endif /* WOLFSSL_HAVE_LMS */
#endif /* WOLFSSL_HAVE_LMS && HAVE_LIBLMS */

View File

@ -28,7 +28,8 @@
#include <wolfssl/wolfcrypt/logging.h>
#include <wolfssl/wolfcrypt/sha256.h>
#ifdef WOLFSSL_HAVE_XMSS
#if defined(WOLFSSL_HAVE_XMSS) && defined(HAVE_LIBXMSS)
#include <wolfssl/wolfcrypt/ext_xmss.h>
#ifdef NO_INLINE
@ -1042,4 +1043,4 @@ int wc_XmssKey_Verify(XmssKey * key, const byte * sig, word32 sigLen,
return ret;
}
#endif /* WOLFSSL_HAVE_XMSS */
#endif /* WOLFSSL_HAVE_XMSS && HAVE_LIBXMSS */

View File

@ -22,12 +22,9 @@
#ifndef EXT_LMS_H
#define EXT_LMS_H
#ifdef WOLFSSL_HAVE_LMS
#include <wolfssl/wolfcrypt/lms.h>
#if defined(WOLFSSL_HAVE_LMS) && defined(HAVE_LIBLMS)
#if !defined(HAVE_LIBLMS)
#error "This code requires liblms"
#endif
#include <wolfssl/wolfcrypt/lms.h>
/* hash-sigs LMS HSS includes */
#include <hss.h>

View File

@ -22,12 +22,9 @@
#ifndef EXT_XMSS_H
#define EXT_XMSS_H
#ifdef WOLFSSL_HAVE_XMSS
#include <wolfssl/wolfcrypt/xmss.h>
#if defined(WOLFSSL_HAVE_XMSS) && defined(HAVE_LIBXMSS)
#if !defined(HAVE_LIBXMSS)
#error "This code requires libxmss"
#endif
#include <wolfssl/wolfcrypt/xmss.h>
#include <xmss.h>
#include <params.h>