Rename LMS and LMOTS init/free functions
To match convention
Signed-off-by: Raef Coles <raef.coles@arm.com>
diff --git a/include/mbedtls/lms.h b/include/mbedtls/lms.h
index 5773c79..c68f727 100644
--- a/include/mbedtls/lms.h
+++ b/include/mbedtls/lms.h
@@ -242,7 +242,7 @@
* \param ctx The uninitialized LMS context that will then be
* initialized.
*/
-void mbedtls_lms_init_public( mbedtls_lms_public_t *ctx );
+void mbedtls_lms_public_init( mbedtls_lms_public_t *ctx );
/**
* \brief This function uninitializes an LMS public context
@@ -250,7 +250,7 @@
* \param ctx The initialized LMS context that will then be
* uninitialized.
*/
-void mbedtls_lms_free_public( mbedtls_lms_public_t *ctx );
+void mbedtls_lms_public_free( mbedtls_lms_public_t *ctx );
/**
* \brief This function imports an LMS public key into a
@@ -304,7 +304,7 @@
*
* \param ctx The uninitialized LMS private context that will
* then be initialized. */
-void mbedtls_lms_init_private( mbedtls_lms_private_t *ctx );
+void mbedtls_lms_private_init( mbedtls_lms_private_t *ctx );
/**
* \brief This function uninitializes an LMS private context
@@ -312,7 +312,7 @@
* \param ctx The initialized LMS private context that will then
* be uninitialized.
*/
-void mbedtls_lms_free_private( mbedtls_lms_private_t *ctx );
+void mbedtls_lms_private_free( mbedtls_lms_private_t *ctx );
/**
* \brief This function generates an LMS private key, and
diff --git a/library/lmots.c b/library/lmots.c
index 54773e1..059d6c8 100644
--- a/library/lmots.c
+++ b/library/lmots.c
@@ -396,14 +396,14 @@
}
}
-void mbedtls_lmots_init_public( mbedtls_lmots_public_t *ctx )
+void mbedtls_lmots_public_init( mbedtls_lmots_public_t *ctx )
{
- mbedtls_platform_zeroize( ctx, sizeof( mbedtls_lmots_public_t ) ) ;
+ mbedtls_platform_zeroize( ctx, sizeof( *ctx ) ) ;
}
-void mbedtls_lmots_free_public( mbedtls_lmots_public_t *ctx )
+void mbedtls_lmots_public_free( mbedtls_lmots_public_t *ctx )
{
- mbedtls_platform_zeroize( ctx, sizeof( mbedtls_lmots_public_t ) ) ;
+ mbedtls_platform_zeroize( ctx, sizeof( *ctx ) ) ;
}
int mbedtls_lmots_import_public_key( mbedtls_lmots_public_t *ctx,
@@ -540,14 +540,14 @@
#if defined(MBEDTLS_LMS_PRIVATE)
-void mbedtls_lmots_init_private( mbedtls_lmots_private_t *ctx )
+void mbedtls_lmots_private_init( mbedtls_lmots_private_t *ctx )
{
- mbedtls_platform_zeroize( ctx, sizeof( mbedtls_lmots_private_t ) ) ;
+ mbedtls_platform_zeroize( ctx, sizeof( *ctx ) ) ;
}
-void mbedtls_lmots_free_private( mbedtls_lmots_private_t *ctx )
+void mbedtls_lmots_private_free( mbedtls_lmots_private_t *ctx )
{
- mbedtls_platform_zeroize( ctx, sizeof( mbedtls_lmots_private_t ) ) ;
+ mbedtls_platform_zeroize( ctx, sizeof( *ctx ) ) ;
}
int mbedtls_lmots_generate_private_key( mbedtls_lmots_private_t *ctx,
diff --git a/library/lmots.h b/library/lmots.h
index 2f42a59..05bd967 100644
--- a/library/lmots.h
+++ b/library/lmots.h
@@ -96,7 +96,7 @@
* \param ctx The uninitialized LMOTS context that will then be
* initialized.
*/
-void mbedtls_lmots_init_public( mbedtls_lmots_public_t *ctx );
+void mbedtls_lmots_public_init( mbedtls_lmots_public_t *ctx );
/**
* \brief This function uninitializes a public LMOTS context
@@ -104,7 +104,7 @@
* \param ctx The initialized LMOTS context that will then be
* uninitialized.
*/
-void mbedtls_lmots_free_public( mbedtls_lmots_public_t *ctx );
+void mbedtls_lmots_public_free( mbedtls_lmots_public_t *ctx );
/**
* \brief This function imports an LMOTS public key into a
@@ -198,7 +198,7 @@
* \param ctx The uninitialized LMOTS context that will then be
* initialized.
*/
-void mbedtls_lmots_init_private( mbedtls_lmots_private_t *ctx );
+void mbedtls_lmots_private_init( mbedtls_lmots_private_t *ctx );
/**
* \brief This function uninitializes a private LMOTS context
@@ -206,7 +206,7 @@
* \param ctx The initialized LMOTS context that will then be
* uninitialized.
*/
-void mbedtls_lmots_free_private( mbedtls_lmots_private_t *ctx );
+void mbedtls_lmots_private_free( mbedtls_lmots_private_t *ctx );
/**
* \brief This function calculates an LMOTS private key, and
diff --git a/library/lms.c b/library/lms.c
index ec6ec0c..e17d9be 100644
--- a/library/lms.c
+++ b/library/lms.c
@@ -219,14 +219,14 @@
return( mbedtls_lms_error_from_psa( status ) );
}
-void mbedtls_lms_init_public( mbedtls_lms_public_t *ctx )
+void mbedtls_lms_public_init( mbedtls_lms_public_t *ctx )
{
- mbedtls_platform_zeroize( ctx, sizeof( mbedtls_lms_public_t ) ) ;
+ mbedtls_platform_zeroize( ctx, sizeof( *ctx ) ) ;
}
-void mbedtls_lms_free_public( mbedtls_lms_public_t *ctx )
+void mbedtls_lms_public_free( mbedtls_lms_public_t *ctx )
{
- mbedtls_platform_zeroize( ctx, sizeof( mbedtls_lms_public_t ) );
+ mbedtls_platform_zeroize( ctx, sizeof( *ctx ) );
}
int mbedtls_lms_import_public_key( mbedtls_lms_public_t *ctx,
@@ -489,12 +489,12 @@
return( 0 );
}
-void mbedtls_lms_init_private( mbedtls_lms_private_t *ctx )
+void mbedtls_lms_private_init( mbedtls_lms_private_t *ctx )
{
- mbedtls_platform_zeroize( ctx, sizeof( mbedtls_lms_private_t ) ) ;
+ mbedtls_platform_zeroize( ctx, sizeof( *ctx ) ) ;
}
-void mbedtls_lms_free_private( mbedtls_lms_private_t *ctx )
+void mbedtls_lms_private_free( mbedtls_lms_private_t *ctx )
{
unsigned int idx;
@@ -502,15 +502,15 @@
{
for( idx = 0; idx < MERKLE_TREE_LEAF_NODE_AM(ctx->params.type); idx++ )
{
- mbedtls_lmots_free_private( &ctx->ots_private_keys[idx] );
- mbedtls_lmots_free_public( &ctx->ots_public_keys[idx] );
+ mbedtls_lmots_private_free( &ctx->ots_private_keys[idx] );
+ mbedtls_lmots_public_free( &ctx->ots_public_keys[idx] );
}
mbedtls_free( ctx->ots_private_keys );
mbedtls_free( ctx->ots_public_keys );
}
- mbedtls_platform_zeroize( ctx, sizeof( mbedtls_lms_private_t ) );
+ mbedtls_platform_zeroize( ctx, sizeof( *ctx ) );
}
@@ -565,8 +565,8 @@
for( idx = 0; idx < MERKLE_TREE_LEAF_NODE_AM(ctx->params.type); idx++ )
{
- mbedtls_lmots_init_private( &ctx->ots_private_keys[idx] );
- mbedtls_lmots_init_public( &ctx->ots_public_keys[idx] );
+ mbedtls_lmots_private_init( &ctx->ots_private_keys[idx] );
+ mbedtls_lmots_public_init( &ctx->ots_public_keys[idx] );
}
@@ -593,8 +593,8 @@
{
for ( free_idx = 0; free_idx < idx; free_idx++ )
{
- mbedtls_lmots_free_private( &ctx->ots_private_keys[free_idx] );
- mbedtls_lmots_free_public( &ctx->ots_public_keys[free_idx] );
+ mbedtls_lmots_private_free( &ctx->ots_private_keys[free_idx] );
+ mbedtls_lmots_public_free( &ctx->ots_public_keys[free_idx] );
}
mbedtls_free( ctx->ots_private_keys );
diff --git a/tests/suites/test_suite_lmots.function b/tests/suites/test_suite_lmots.function
index 85e1da7..de1cf2c6 100644
--- a/tests/suites/test_suite_lmots.function
+++ b/tests/suites/test_suite_lmots.function
@@ -36,8 +36,8 @@
mbedtls_lmots_private_t priv_ctx;
unsigned char sig[MBEDTLS_LMOTS_SIG_LEN(MBEDTLS_LMOTS_SHA256_N32_W8)];
- mbedtls_lmots_init_public( &pub_ctx );
- mbedtls_lmots_init_private( &priv_ctx );
+ mbedtls_lmots_public_init( &pub_ctx );
+ mbedtls_lmots_private_init( &priv_ctx );
TEST_ASSERT( mbedtls_lmots_generate_private_key(&priv_ctx, MBEDTLS_LMOTS_SHA256_N32_W8,
key_id->x, leaf_id, seed->x, seed->len ) == 0 );
@@ -47,8 +47,8 @@
TEST_ASSERT( mbedtls_lmots_verify(&pub_ctx, msg->x, msg->len, sig, sizeof(sig)) == 0 );
exit:
- mbedtls_lmots_free_public( &pub_ctx );
- mbedtls_lmots_free_private( &priv_ctx );
+ mbedtls_lmots_public_free( &pub_ctx );
+ mbedtls_lmots_private_free( &priv_ctx );
}
/* END_CASE */
@@ -59,8 +59,8 @@
mbedtls_lmots_private_t priv_ctx;
unsigned char sig[MBEDTLS_LMOTS_SIG_LEN(MBEDTLS_LMOTS_SHA256_N32_W8)];
- mbedtls_lmots_init_public( &pub_ctx );
- mbedtls_lmots_init_private( &priv_ctx );
+ mbedtls_lmots_public_init( &pub_ctx );
+ mbedtls_lmots_private_init( &priv_ctx );
TEST_ASSERT( mbedtls_lmots_generate_private_key(&priv_ctx, MBEDTLS_LMOTS_SHA256_N32_W8,
key_id->x, leaf_id, seed->x, seed->len ) == 0 );
@@ -70,8 +70,8 @@
TEST_ASSERT( mbedtls_lmots_verify(&pub_ctx, NULL, 0, sig, sizeof(sig)) == 0 );
exit:
- mbedtls_lmots_free_public( &pub_ctx );
- mbedtls_lmots_free_private( &priv_ctx );
+ mbedtls_lmots_public_free( &pub_ctx );
+ mbedtls_lmots_private_free( &priv_ctx );
}
/* END_CASE */
@@ -81,14 +81,14 @@
{
mbedtls_lmots_public_t ctx;
- mbedtls_lmots_init_public( &ctx );
+ mbedtls_lmots_public_init( &ctx );
mbedtls_lmots_import_public_key( &ctx, pub_key->x, pub_key->len );
TEST_ASSERT(mbedtls_lmots_verify( &ctx, msg->x, msg->len, sig->x, sig->len ) == expected_rc );
exit:
- mbedtls_lmots_free_public( &ctx );
+ mbedtls_lmots_public_free( &ctx );
}
/* END_CASE */
@@ -99,7 +99,7 @@
uint8_t exported_pub_key[MBEDTLS_LMOTS_PUBLIC_KEY_LEN(MBEDTLS_LMOTS_SHA256_N32_W8)];
size_t exported_pub_key_len;
- mbedtls_lmots_init_public( &ctx );
+ mbedtls_lmots_public_init( &ctx );
TEST_ASSERT( mbedtls_lmots_import_public_key( &ctx, pub_key->x, pub_key->len ) == 0 );
TEST_ASSERT( mbedtls_lmots_export_public_key( &ctx, exported_pub_key,
sizeof( exported_pub_key ),
@@ -109,7 +109,7 @@
exported_pub_key, exported_pub_key_len );
exit:
- mbedtls_lmots_free_public( &ctx );
+ mbedtls_lmots_public_free( &ctx );
}
/* END_CASE */
@@ -119,7 +119,7 @@
mbedtls_lmots_private_t ctx;
unsigned char sig[MBEDTLS_LMOTS_SIG_LEN(MBEDTLS_LMOTS_SHA256_N32_W8)];
- mbedtls_lmots_init_private( &ctx );
+ mbedtls_lmots_private_init( &ctx );
TEST_ASSERT( mbedtls_lmots_generate_private_key(&ctx, MBEDTLS_LMOTS_SHA256_N32_W8,
key_id->x, leaf_id, seed->x,
seed->len ) == 0 );
@@ -133,7 +133,7 @@
msg->x, msg->len, sig, sizeof( sig ), NULL ) != 0 );
exit:
- mbedtls_lmots_free_private( &ctx );
+ mbedtls_lmots_private_free( &ctx );
}
/* END_CASE */
@@ -149,7 +149,7 @@
/* Fill with recognisable pattern */
memset( sig, 0x7E, sizeof( sig ) );
- mbedtls_lmots_init_private( &ctx );
+ mbedtls_lmots_private_init( &ctx );
TEST_ASSERT( mbedtls_lmots_generate_private_key(&ctx, MBEDTLS_LMOTS_SHA256_N32_W8,
key_id->x, leaf_id, seed->x,
seed->len ) == 0 );
@@ -157,7 +157,7 @@
msg->x, msg->len, sig, sizeof( sig ), NULL ) == 0 );
exit:
- mbedtls_lmots_free_private( &ctx );
+ mbedtls_lmots_private_free( &ctx );
mbedtls_lmots_sign_private_key_invalidated_hook = NULL;
}
/* END_CASE */
diff --git a/tests/suites/test_suite_lms.function b/tests/suites/test_suite_lms.function
index 3c23b3b..425e994 100644
--- a/tests/suites/test_suite_lms.function
+++ b/tests/suites/test_suite_lms.function
@@ -16,8 +16,8 @@
unsigned char sig[MBEDTLS_LMS_SIG_LEN(MBEDTLS_LMS_SHA256_M32_H10, MBEDTLS_LMOTS_SHA256_N32_W8)];
int rc;
- mbedtls_lms_init_public( &pub_ctx );
- mbedtls_lms_init_private( &priv_ctx );
+ mbedtls_lms_public_init( &pub_ctx );
+ mbedtls_lms_private_init( &priv_ctx );
/* Allocation failure isn't a test failure, since it likely just means
* there's not enough memory to run the test.
@@ -39,8 +39,8 @@
sizeof( sig ) ) == 0 );
exit:
- mbedtls_lms_free_public( &pub_ctx );
- mbedtls_lms_free_private( &priv_ctx );
+ mbedtls_lms_public_free( &pub_ctx );
+ mbedtls_lms_private_free( &priv_ctx );
}
/* END_CASE */
@@ -52,8 +52,8 @@
unsigned char sig[MBEDTLS_LMS_SIG_LEN(MBEDTLS_LMS_SHA256_M32_H10, MBEDTLS_LMOTS_SHA256_N32_W8)];
int rc;
- mbedtls_lms_init_public( &pub_ctx );
- mbedtls_lms_init_private( &priv_ctx );
+ mbedtls_lms_public_init( &pub_ctx );
+ mbedtls_lms_private_init( &priv_ctx );
/* Allocation failure isn't a test failure, since it likely just means
* there's not enough memory to run the test.
@@ -75,8 +75,8 @@
sizeof( sig ) ) == 0 );
exit:
- mbedtls_lms_free_public( &pub_ctx );
- mbedtls_lms_free_private( &priv_ctx );
+ mbedtls_lms_public_free( &pub_ctx );
+ mbedtls_lms_private_free( &priv_ctx );
}
/* END_CASE */
@@ -86,14 +86,14 @@
{
mbedtls_lms_public_t ctx;
- mbedtls_lms_init_public( &ctx);
+ mbedtls_lms_public_init( &ctx);
mbedtls_lms_import_public_key( &ctx, pub_key->x, pub_key->len );
TEST_ASSERT( mbedtls_lms_verify( &ctx, msg->x, msg->len, sig->x, sig->len ) == expected_rc );
exit:
- mbedtls_lms_free_public( &ctx );
+ mbedtls_lms_public_free( &ctx );
}
/* END_CASE */
@@ -103,7 +103,7 @@
mbedtls_lms_public_t ctx;
uint8_t exported_pub_key[MBEDTLS_LMS_PUBLIC_KEY_LEN(MBEDTLS_LMS_SHA256_M32_H10)];
- mbedtls_lms_init_public(&ctx);
+ mbedtls_lms_public_init(&ctx);
TEST_ASSERT( mbedtls_lms_import_public_key( &ctx, pub_key->x, pub_key->len ) == 0 );
TEST_ASSERT( mbedtls_lms_export_public_key( &ctx, exported_pub_key,
sizeof(exported_pub_key), NULL ) == 0 );
@@ -112,7 +112,7 @@
exported_pub_key, MBEDTLS_LMS_PUBLIC_KEY_LEN(MBEDTLS_LMS_SHA256_M32_H10) );
exit:
- mbedtls_lms_free_public( &ctx );
+ mbedtls_lms_public_free( &ctx );
}
/* END_CASE */