Update LMS and LMOTS dependency macros

Signed-off-by: Raef Coles <raef.coles@arm.com>
This commit is contained in:
Raef Coles 2022-10-07 10:35:56 +01:00
parent 56fe20a473
commit 5127e859d7
No known key found for this signature in database
GPG key ID: 1AAF1B43DF2086F4
8 changed files with 28 additions and 28 deletions

View file

@ -354,8 +354,8 @@
#endif
#if defined(MBEDTLS_LMS_C) && \
( !defined(MBEDTLS_PSA_CRYPTO_C) )
#error "MBEDTLS_LMS_C requires MBEDTLS_PSA_CRYPTO_C"
( !defined(MBEDTLS_PSA_CRYPTO_C) && !defined(PSA_WANT_ALG_SHA256) )
#error "MBEDTLS_LMS_C requires MBEDTLS_PSA_CRYPTO_C and PSA_WANT_ALG_SHA256"
#endif
#if defined(MBEDTLS_LMS_PRIVATE) && \

View file

@ -139,7 +139,7 @@ typedef struct {
Boolean values only. */
} mbedtls_lmots_public_t;
#ifdef MBEDTLS_LMS_PRIVATE
#if defined(MBEDTLS_LMS_PRIVATE)
/** LMOTS private context structure.
*
* A LMOTS private key is one hash output for each of digit of the digest +
@ -163,7 +163,7 @@ typedef struct {
unsigned char MBEDTLS_PRIVATE(have_private_key); /*!< Whether the context contains a private key.
Boolean values only. */
} mbedtls_lmots_private_t;
#endif /* MBEDTLS_LMS_PRIVATE */
#endif /* defined(MBEDTLS_LMS_PRIVATE) */
/** LMS parameters structure.
@ -209,7 +209,7 @@ typedef struct {
} mbedtls_lms_public_t;
#ifdef MBEDTLS_LMS_PRIVATE
#if defined(MBEDTLS_LMS_PRIVATE)
/** LMS private context structure.
*
* A LMS private key is a set of LMOTS private keys, an index to the next usable
@ -237,7 +237,7 @@ typedef struct {
unsigned char MBEDTLS_PRIVATE(have_private_key); /*!< Whether the context contains a private key.
Boolean values only. */
} mbedtls_lms_private_t;
#endif /* MBEDTLS_LMS_PRIVATE */
#endif /* defined(MBEDTLS_LMS_PRIVATE) */
/**
* \brief This function initializes an LMS public context
@ -301,7 +301,7 @@ int mbedtls_lms_verify( const mbedtls_lms_public_t *ctx,
const unsigned char *msg, size_t msg_size,
const unsigned char *sig, size_t sig_size );
#ifdef MBEDTLS_LMS_PRIVATE
#if defined(MBEDTLS_LMS_PRIVATE)
/**
* \brief This function initializes an LMS private context
*
@ -434,7 +434,7 @@ int mbedtls_lms_sign( mbedtls_lms_private_t *ctx,
int (*f_rng)(void *, unsigned char *, size_t),
void* p_rng, unsigned char *msg, unsigned int msg_size,
unsigned char *sig, size_t sig_size, size_t *sig_len );
#endif /* MBEDTLS_LMS_PRIVATE */
#endif /* defined(MBEDTLS_LMS_PRIVATE) */
#ifdef __cplusplus
}

View file

@ -2485,7 +2485,7 @@
*
* Uncomment to enable the LMS signature algorithm and private key operations.
*/
// #define MBEDTLS_LMS_PRIVATE
//#define MBEDTLS_LMS_PRIVATE
/**
* \def MBEDTLS_NIST_KW_C