Update LMS/LMOTS tests
Document tests and source of data, use test RNG, pass more parameters
into each test
Signed-off-by: Raef Coles <raef.coles@arm.com>
diff --git a/tests/suites/test_suite_lmots.function b/tests/suites/test_suite_lmots.function
index ce69803..2a9ea54 100644
--- a/tests/suites/test_suite_lmots.function
+++ b/tests/suites/test_suite_lmots.function
@@ -2,52 +2,39 @@
#include "lmots.h"
#include "mbedtls/lms.h"
-#include "mbedtls/entropy.h"
-#include "mbedtls/ctr_drbg.h"
-
/* END_HEADER */
/* BEGIN_DEPENDENCIES
- * depends_on:MBEDTLS_LMS_C:MBEDTLS_LMS_PRIVATE:MBEDTLS_PSA_CRYPTO_C:MBEDTLS_CTR_DRBG_C
+ * depends_on:MBEDTLS_LMS_C:MBEDTLS_LMS_PRIVATE:MBEDTLS_PSA_CRYPTO_C
* END_DEPENDENCIES
*/
/* BEGIN_CASE */
-void lmots_sign_verify_test ( data_t * msg )
+void lmots_sign_verify_test ( data_t *msg, data_t *key_id, int leaf_id,
+ data_t *seed )
{
mbedtls_lmots_public_t pub_ctx;
mbedtls_lmots_private_t priv_ctx;
unsigned char sig[MBEDTLS_LMOTS_SIG_LEN(MBEDTLS_LMOTS_SHA256_N32_W8)];
- mbedtls_entropy_context entropy_ctx;
- mbedtls_ctr_drbg_context drbg_ctx;
- uint8_t seed[16];
- mbedtls_entropy_init( &entropy_ctx );
- mbedtls_ctr_drbg_init( &drbg_ctx );
mbedtls_lmots_init_public( &pub_ctx );
mbedtls_lmots_init_private( &priv_ctx );
- TEST_ASSERT( mbedtls_ctr_drbg_seed( &drbg_ctx, mbedtls_entropy_func,
- &entropy_ctx, (uint8_t*)"", 0 ) == 0 );
- TEST_ASSERT( mbedtls_ctr_drbg_random( &drbg_ctx, seed, sizeof( seed ) ) == 0 );
-
TEST_ASSERT( mbedtls_lmots_generate_private_key(&priv_ctx, MBEDTLS_LMOTS_SHA256_N32_W8,
- (uint8_t[16]){0}, 0x12, seed, sizeof( seed ) ) == 0 );
+ key_id->x, leaf_id, seed->x, seed->len ) == 0 );
TEST_ASSERT( mbedtls_lmots_calculate_public_key(&pub_ctx, &priv_ctx) == 0 );
- TEST_ASSERT( mbedtls_lmots_sign(&priv_ctx, mbedtls_ctr_drbg_random, &drbg_ctx,
+ TEST_ASSERT( mbedtls_lmots_sign(&priv_ctx, &mbedtls_test_rnd_std_rand, NULL,
msg->x, msg->len, sig, sizeof(sig), NULL ) == 0 );
TEST_ASSERT( mbedtls_lmots_verify(&pub_ctx, msg->x, msg->len, sig, sizeof(sig)) == 0 );
exit:
- mbedtls_entropy_free( &entropy_ctx );
- mbedtls_ctr_drbg_free( &drbg_ctx );
mbedtls_lmots_free_public( &pub_ctx );
mbedtls_lmots_free_private( &priv_ctx );
}
/* END_CASE */
/* BEGIN_CASE */
-void lmots_verify_test ( data_t * msg, data_t * sig, data_t * pub_key,
+void lmots_verify_test ( data_t *msg, data_t *sig, data_t *pub_key,
int expected_rc )
{
mbedtls_lmots_public_t ctx;
@@ -68,13 +55,16 @@
{
mbedtls_lmots_public_t ctx;
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 );
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 ), NULL ) == 0 );
+ TEST_ASSERT( mbedtls_lmots_export_public_key( &ctx, exported_pub_key,
+ sizeof( exported_pub_key ),
+ &exported_pub_key_len ) == 0 );
- TEST_ASSERT( memcmp( pub_key->x, exported_pub_key,
- MBEDTLS_LMOTS_PUBLIC_KEY_LEN(MBEDTLS_LMOTS_SHA256_N32_W8) ) == 0 );
+ ASSERT_COMPARE( pub_key->x, pub_key->len,
+ exported_pub_key, exported_pub_key_len );
exit:
mbedtls_lmots_free_public( &ctx );
@@ -82,36 +72,25 @@
/* END_CASE */
/* BEGIN_CASE */
-void lmots_reuse_test ( data_t * msg )
+void lmots_reuse_test ( data_t *msg, data_t *key_id, int leaf_id, data_t *seed )
{
mbedtls_lmots_private_t ctx;
unsigned char sig[MBEDTLS_LMOTS_SIG_LEN(MBEDTLS_LMOTS_SHA256_N32_W8)];
- mbedtls_entropy_context entropy_ctx;
- mbedtls_ctr_drbg_context drbg_ctx;
- uint8_t seed[16];
-
- mbedtls_entropy_init( &entropy_ctx );
- mbedtls_ctr_drbg_init( &drbg_ctx );
- TEST_ASSERT( mbedtls_ctr_drbg_seed(&drbg_ctx, mbedtls_entropy_func,
- &entropy_ctx, (uint8_t*)"", 0 ) == 0 );
-
- mbedtls_ctr_drbg_random( &drbg_ctx, seed, sizeof( seed ) );
mbedtls_lmots_init_private( &ctx );
TEST_ASSERT( mbedtls_lmots_generate_private_key(&ctx, MBEDTLS_LMOTS_SHA256_N32_W8,
- (uint8_t[16]){0}, 0x12, seed, sizeof( seed ) ) == 0 );
- TEST_ASSERT( mbedtls_lmots_sign(&ctx, mbedtls_ctr_drbg_random, &drbg_ctx,
+ key_id->x, leaf_id, seed->x,
+ seed->len ) == 0 );
+ TEST_ASSERT( mbedtls_lmots_sign(&ctx, mbedtls_test_rnd_std_rand, NULL,
msg->x, msg->len, sig, sizeof( sig ), NULL ) == 0 );
/* Running another sign operation should fail, since the key should now have
* been erased.
*/
- TEST_ASSERT( mbedtls_lmots_sign(&ctx, mbedtls_ctr_drbg_random, &drbg_ctx,
+ TEST_ASSERT( mbedtls_lmots_sign(&ctx, mbedtls_test_rnd_std_rand, NULL,
msg->x, msg->len, sig, sizeof( sig ), NULL ) != 0 );
exit:
- mbedtls_entropy_free( &entropy_ctx );
- mbedtls_ctr_drbg_free( &drbg_ctx );
mbedtls_lmots_free_private( &ctx );
}
/* END_CASE */