commit 7dce69a27aa606ac4b7be1199599a7ded3fc9397
author Raef Coles <raef.coles@arm.com> Wed Aug 24 14:07:06 2022 +0100
committer Raef Coles <raef.coles@arm.com> Thu Oct 13 14:28:22 2022 +0100
tree f782158c4e66df011d90c9b9afbfe34cc4352561
parent 2ad6e611f06a32a0721a1df2c625bc731d6e04f4

Make LMOTS a private api

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

library/lmots.c

diff --git a/library/lmots.c b/library/lmots.c
index 7319d29..2c44772 100644
--- a/library/lmots.c
+++ b/library/lmots.c
@@ -32,11 +32,12 @@
 
 #include "common.h"
 
-#ifdef MBEDTLS_LMOTS_C
+#ifdef MBEDTLS_LMS_C
 
 #include <string.h>
 
-#include "mbedtls/lmots.h"
+#include "lmots.h"
+
 #include "mbedtls/md.h"
 #include "mbedtls/platform_util.h"
 #include "mbedtls/error.h"
@@ -329,7 +330,7 @@
 {
     if( ctx == NULL )
     {
-        return( MBEDTLS_ERR_LMOTS_BAD_INPUT_DATA );
+        return( MBEDTLS_ERR_LMS_BAD_INPUT_DATA );
     }
 
     ctx->MBEDTLS_PRIVATE(type) = type;
@@ -350,7 +351,7 @@
 
     if (I_key_identifier == NULL || msg == NULL || sig == NULL || out == NULL)
     {
-        return( MBEDTLS_ERR_LMOTS_BAD_INPUT_DATA );
+        return( MBEDTLS_ERR_LMS_BAD_INPUT_DATA );
     }
 
     ret = create_symbol_array( I_key_identifier, q_leaf_identifier, msg, msg_len,
@@ -390,13 +391,13 @@
 
     if( ctx == NULL || f_rng == NULL || p_rng == NULL || msg == NULL || sig == NULL)
     {
-        return( MBEDTLS_ERR_LMOTS_BAD_INPUT_DATA );
+        return( MBEDTLS_ERR_LMS_BAD_INPUT_DATA );
     }
 
     /* Check that a private key is loaded */
     if ( !ctx->MBEDTLS_PRIVATE(have_privkey) )
     {
-        return( MBEDTLS_ERR_LMOTS_BAD_INPUT_DATA );
+        return( MBEDTLS_ERR_LMS_BAD_INPUT_DATA );
     }
 
     ret = f_rng( p_rng, sig + MBEDTLS_LMOTS_SIG_C_RANDOM_OFFSET, MBEDTLS_LMOTS_N_HASH_LEN );
@@ -447,23 +448,23 @@
 
     if( ctx == NULL || msg == NULL || sig == NULL)
     {
-        return( MBEDTLS_ERR_LMOTS_BAD_INPUT_DATA );
+        return( MBEDTLS_ERR_LMS_BAD_INPUT_DATA );
     }
 
     if ( !ctx->MBEDTLS_PRIVATE(have_pubkey) )
     {
-        return( MBEDTLS_ERR_LMOTS_BAD_INPUT_DATA );
+        return( MBEDTLS_ERR_LMS_BAD_INPUT_DATA );
     }
 
     if( ctx->MBEDTLS_PRIVATE(type ) != MBEDTLS_LMOTS_SHA256_N32_W8 )
     {
-        return( MBEDTLS_ERR_LMOTS_BAD_INPUT_DATA );
+        return( MBEDTLS_ERR_LMS_BAD_INPUT_DATA );
     }
 
     if ( network_bytes_to_val( MBEDTLS_LMOTS_TYPE_LEN,
                                sig + MBEDTLS_LMOTS_SIG_TYPE_OFFSET ) != MBEDTLS_LMOTS_SHA256_N32_W8 )
     {
-        return( MBEDTLS_ERR_LMOTS_VERIFY_FAILED );
+        return( MBEDTLS_ERR_LMS_VERIFY_FAILED );
     }
 
     ret = mbedtls_lmots_generate_pub_key_candidate( ctx->MBEDTLS_PRIVATE(I_key_identifier),
@@ -478,7 +479,7 @@
     if ( memcmp( &Kc_public_key_candidate, ctx->MBEDTLS_PRIVATE(pub_key),
                  sizeof( ctx->MBEDTLS_PRIVATE(pub_key) ) ) )
     {
-        return( MBEDTLS_ERR_LMOTS_VERIFY_FAILED );
+        return( MBEDTLS_ERR_LMS_VERIFY_FAILED );
     }
 
     return( 0 );
@@ -489,7 +490,7 @@
 {
     if ( ctx == NULL || key == NULL)
     {
-        return( MBEDTLS_ERR_LMOTS_BAD_INPUT_DATA );
+        return( MBEDTLS_ERR_LMS_BAD_INPUT_DATA );
     }
 
     ctx->MBEDTLS_PRIVATE(type) = network_bytes_to_val( MBEDTLS_LMOTS_TYPE_LEN,
@@ -515,12 +516,12 @@
 {
     if ( ctx == NULL || key == NULL)
     {
-        return( MBEDTLS_ERR_LMOTS_BAD_INPUT_DATA );
+        return( MBEDTLS_ERR_LMS_BAD_INPUT_DATA );
     }
 
     if ( ! ctx->MBEDTLS_PRIVATE(have_pubkey) )
     {
-        return( MBEDTLS_ERR_LMOTS_BAD_INPUT_DATA );
+        return( MBEDTLS_ERR_LMS_BAD_INPUT_DATA );
     }
 
     val_to_network_bytes( ctx->MBEDTLS_PRIVATE(type), MBEDTLS_LMOTS_TYPE_LEN,
@@ -546,13 +547,13 @@
 
     if( ctx == NULL )
     {
-        return( MBEDTLS_ERR_LMOTS_BAD_INPUT_DATA );
+        return( MBEDTLS_ERR_LMS_BAD_INPUT_DATA );
     }
 
     /* Check that a private key is loaded */
     if ( !ctx->MBEDTLS_PRIVATE(have_privkey) )
     {
-        return( MBEDTLS_ERR_LMOTS_BAD_INPUT_DATA );
+        return( MBEDTLS_ERR_LMS_BAD_INPUT_DATA );
     }
 
     ret = hash_symbol_array( ctx->MBEDTLS_PRIVATE(I_key_identifier),
@@ -592,16 +593,16 @@
 
     if( ctx == NULL || I_key_identifier == NULL || seed == NULL)
     {
-        return( MBEDTLS_ERR_LMOTS_BAD_INPUT_DATA );
+        return( MBEDTLS_ERR_LMS_BAD_INPUT_DATA );
     }
 
     if ( ctx->MBEDTLS_PRIVATE(have_privkey) )
     {
-        return( MBEDTLS_ERR_LMOTS_BAD_INPUT_DATA );
+        return( MBEDTLS_ERR_LMS_BAD_INPUT_DATA );
     }
 
     if ( ctx->MBEDTLS_PRIVATE(type) != MBEDTLS_LMOTS_SHA256_N32_W8 ) {
-        return( MBEDTLS_ERR_LMOTS_BAD_INPUT_DATA );
+        return( MBEDTLS_ERR_LMS_BAD_INPUT_DATA );
     }
 
     memcpy( ctx->MBEDTLS_PRIVATE(I_key_identifier), I_key_identifier,
@@ -681,4 +682,4 @@
     return ret;
 }
 
-#endif /* MBEDTLS_LMOTS_C */
+#endif /* MBEDTLS_LMS_C */