commit 5127e859d77eb802f8a4631f9ae6be7dbda260ad
author Raef Coles <raef.coles@arm.com> Fri Oct 07 10:35:56 2022 +0100
committer Raef Coles <raef.coles@arm.com> Thu Oct 13 14:29:11 2022 +0100
tree d80e0022d2ead70cf32a195f1650184af791d878
parent 56fe20a47385cd5d6d03e5da9210ad601e1bca46

Update LMS and LMOTS dependency macros

Signed-off-by: Raef Coles <raef.coles@arm.com>

library/lmots.c

diff --git a/library/lmots.c b/library/lmots.c
index e196635..9a6c6be 100644
--- a/library/lmots.c
+++ b/library/lmots.c
@@ -32,7 +32,7 @@
 
 #include "common.h"
 
-#ifdef MBEDTLS_LMS_C
+#if defined(MBEDTLS_LMS_C)
 
 #include <string.h>
 
@@ -568,7 +568,7 @@
     return( 0 );
 }
 
-#ifdef MBEDTLS_LMS_PRIVATE
+#if defined(MBEDTLS_LMS_PRIVATE)
 
 void mbedtls_lmots_init_private( mbedtls_lmots_private_t *ctx )
 {
@@ -851,5 +851,5 @@
     return( 0 );
 }
 
-#endif /* MBEDTLS_LMS_PRIVATE */
-#endif /* MBEDTLS_LMS_C */
+#endif /* defined(MBEDTLS_LMS_PRIVATE) */
+#endif /* defined(MBEDTLS_LMS_C) */

library/lmots.h

diff --git a/library/lmots.h b/library/lmots.h
index 214321a..37466b7 100644
--- a/library/lmots.h
+++ b/library/lmots.h
@@ -189,7 +189,7 @@
                           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 a private LMOTS context
@@ -310,7 +310,7 @@
                         void *p_rng, const unsigned char *msg, size_t msg_size,
                         unsigned char *sig, size_t sig_size, size_t* sig_len );
 
-#endif /* MBEDTLS_LMS_PRIVATE */
+#endif /* defined(MBEDTLS_LMS_PRIVATE) */
 
 #ifdef __cplusplus
 }

library/lms.c

diff --git a/library/lms.c b/library/lms.c
index 1c66946..6882a48 100644
--- a/library/lms.c
+++ b/library/lms.c
@@ -32,7 +32,7 @@
 
 #include "common.h"
 
-#ifdef MBEDTLS_LMS_C
+#if defined(MBEDTLS_LMS_C)
 
 #include <string.h>
 
@@ -402,7 +402,7 @@
     return( 0 );
 }
 
-#ifdef MBEDTLS_LMS_PRIVATE
+#if defined(MBEDTLS_LMS_PRIVATE)
 
 /* Calculate a full merkle tree based on a private key. This function
  * implements RFC8554 section 5.3, and is used to generate a public key (as the
@@ -773,5 +773,5 @@
     return( 0 );
 }
 
-#endif /* MBEDTLS_LMS_PRIVATE */
-#endif /* MBEDTLS_LMS_C */
+#endif /* defined(MBEDTLS_LMS_PRIVATE) */
+#endif /* defined(MBEDTLS_LMS_C) */