yuzu-emu/mbedtls
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Make LMS functions args const where required

Browse source 
Signed-off-by: Raef Coles <raef.coles@arm.com>
This commit is contained in:
Raef Coles 2022-10-07 11:12:27 +01:00
parent f6ddd51bfd
commit 2ac352a322
No known key found for this signature in database
GPG key ID: 1AAF1B43DF2086F4
4 changed files with 25 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
include/mbedtls/lms.h
View file

@ -341,7 +341,7 @@ int mbedtls_lms_generate_private_key( mbedtls_lms_private_t *ctx,
mbedtls_lms_algorithm_type_t type, mbedtls_lms_algorithm_type_t type,
mbedtls_lmots_algorithm_type_t otstype, mbedtls_lmots_algorithm_type_t otstype,
int (*f_rng)(void *, unsigned char *, size_t), int (*f_rng)(void *, unsigned char *, size_t),
void* p_rng, unsigned char *seed, void* p_rng, const unsigned char *seed,
size_t seed_size ); size_t seed_size );
/** /**
@ -363,7 +363,7 @@ int mbedtls_lms_generate_private_key( mbedtls_lms_private_t *ctx,
* \return A non-zero error code on failure. * \return A non-zero error code on failure.
*/ */
int mbedtls_lms_calculate_public_key( mbedtls_lms_public_t *ctx, int mbedtls_lms_calculate_public_key( mbedtls_lms_public_t *ctx,
mbedtls_lms_private_t *priv_ctx ); const mbedtls_lms_private_t *priv_ctx );
/** /**
* \brief This function exports an LMS public key from a * \brief This function exports an LMS public key from a
@ -388,8 +388,9 @@ int mbedtls_lms_calculate_public_key( mbedtls_lms_public_t *ctx,
* \return \c 0 on success. * \return \c 0 on success.
* \return A non-zero error code on failure. * \return A non-zero error code on failure.
*/ */
int mbedtls_lms_export_public_key( mbedtls_lms_public_t *ctx, unsigned char *key, int mbedtls_lms_export_public_key( const mbedtls_lms_public_t *ctx,
size_t key_size, size_t *key_len ); unsigned char *key, size_t key_size,
size_t *key_len );
/** /**
* \brief This function creates a LMS signature, using a * \brief This function creates a LMS signature, using a
@ -429,8 +430,9 @@ int mbedtls_lms_export_public_key( mbedtls_lms_public_t *ctx, unsigned char *key
*/ */
int mbedtls_lms_sign( mbedtls_lms_private_t *ctx, int mbedtls_lms_sign( mbedtls_lms_private_t *ctx,
int (*f_rng)(void *, unsigned char *, size_t), int (*f_rng)(void *, unsigned char *, size_t),
void* p_rng, unsigned char *msg, unsigned int msg_size, void* p_rng, const unsigned char *msg,
unsigned char *sig, size_t sig_size, size_t *sig_len ); unsigned int msg_size, unsigned char *sig, size_t sig_size,
size_t *sig_len );
#endif /* defined(MBEDTLS_LMS_PRIVATE) */ #endif /* defined(MBEDTLS_LMS_PRIVATE) */
#ifdef __cplusplus #ifdef __cplusplus

10
library/lmots.c
View file

@ -521,9 +521,9 @@ int mbedtls_lmots_calculate_public_key_candidate( const mbedtls_lmots_parameters
return( 0 ); return( 0 );
} }
int mbedtls_lmots_verify( mbedtls_lmots_public_t *ctx, const unsigned char *msg, int mbedtls_lmots_verify( const mbedtls_lmots_public_t *ctx,
size_t msg_size, const unsigned char *sig, const unsigned char *msg, size_t msg_size,
size_t sig_size ) const unsigned char *sig, size_t sig_size )
{ {
unsigned char Kc_public_key_candidate[MBEDTLS_LMOTS_N_HASH_LEN_MAX]; unsigned char Kc_public_key_candidate[MBEDTLS_LMOTS_N_HASH_LEN_MAX];
int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED; int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
@ -684,7 +684,7 @@ exit:
} }
int mbedtls_lmots_calculate_public_key( mbedtls_lmots_public_t *ctx, int mbedtls_lmots_calculate_public_key( mbedtls_lmots_public_t *ctx,
mbedtls_lmots_private_t *priv_ctx ) const mbedtls_lmots_private_t *priv_ctx )
{ {
unsigned char y_hashed_digits[MBEDTLS_LMOTS_P_SIG_DIGIT_COUNT_MAX][MBEDTLS_LMOTS_N_HASH_LEN_MAX]; unsigned char y_hashed_digits[MBEDTLS_LMOTS_P_SIG_DIGIT_COUNT_MAX][MBEDTLS_LMOTS_N_HASH_LEN_MAX];
int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED; int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
@ -720,7 +720,7 @@ int mbedtls_lmots_calculate_public_key( mbedtls_lmots_public_t *ctx,
} }
int mbedtls_lmots_export_public_key( mbedtls_lmots_public_t *ctx, int mbedtls_lmots_export_public_key( const mbedtls_lmots_public_t *ctx,
unsigned char *key, size_t key_size, unsigned char *key, size_t key_size,
size_t *key_len ) size_t *key_len )
{ {

9
library/lmots.h
View file

@ -185,7 +185,8 @@ int mbedtls_lmots_calculate_public_key_candidate( const mbedtls_lmots_parameters
* \return \c 0 on successful verification. * \return \c 0 on successful verification.
* \return A non-zero error code on failure. * \return A non-zero error code on failure.
*/ */
int mbedtls_lmots_verify( mbedtls_lmots_public_t *ctx, const unsigned char *msg, int mbedtls_lmots_verify( const mbedtls_lmots_public_t *ctx,
const unsigned char *msg,
size_t msg_size, const unsigned char *sig, size_t msg_size, const unsigned char *sig,
size_t sig_size ); size_t sig_size );
@ -208,7 +209,7 @@ void mbedtls_lmots_init_private( mbedtls_lmots_private_t *ctx );
void mbedtls_lmots_free_private( mbedtls_lmots_private_t *ctx ); void mbedtls_lmots_free_private( mbedtls_lmots_private_t *ctx );
/** /**
* \brief This function generates an LMOTS private key, and * \brief This function calculates an LMOTS private key, and
* stores in into an LMOTS context. * stores in into an LMOTS context.
* *
* \warning This function is **not intended for use in * \warning This function is **not intended for use in
@ -252,7 +253,7 @@ int mbedtls_lmots_generate_private_key( mbedtls_lmots_private_t *ctx,
* \return A non-zero error code on failure. * \return A non-zero error code on failure.
*/ */
int mbedtls_lmots_calculate_public_key( mbedtls_lmots_public_t *ctx, int mbedtls_lmots_calculate_public_key( mbedtls_lmots_public_t *ctx,
mbedtls_lmots_private_t *priv_ctx ); const mbedtls_lmots_private_t *priv_ctx );
/** /**
@ -274,7 +275,7 @@ int mbedtls_lmots_calculate_public_key( mbedtls_lmots_public_t *ctx,
* \return \c 0 on success. * \return \c 0 on success.
* \return A non-zero error code on failure. * \return A non-zero error code on failure.
*/ */
int mbedtls_lmots_export_public_key( mbedtls_lmots_public_t *ctx, int mbedtls_lmots_export_public_key( const mbedtls_lmots_public_t *ctx,
unsigned char *key, size_t key_size, unsigned char *key, size_t key_size,
size_t *key_len ); size_t *key_len );
/** /**

13
library/lms.c
View file

@ -418,7 +418,7 @@ int mbedtls_lms_verify( const mbedtls_lms_public_t *ctx,
* because the merkle tree root is 1-indexed, the 0 * because the merkle tree root is 1-indexed, the 0
* index tree node is never used. * index tree node is never used.
*/ */
static int calculate_merkle_tree( mbedtls_lms_private_t *ctx, static int calculate_merkle_tree( const mbedtls_lms_private_t *ctx,
unsigned char *tree ) unsigned char *tree )
{ {
unsigned int priv_key_idx; unsigned int priv_key_idx;
@ -533,7 +533,7 @@ int mbedtls_lms_generate_private_key( mbedtls_lms_private_t *ctx,
mbedtls_lms_algorithm_type_t type, mbedtls_lms_algorithm_type_t type,
mbedtls_lmots_algorithm_type_t otstype, mbedtls_lmots_algorithm_type_t otstype,
int (*f_rng)(void *, unsigned char *, size_t), int (*f_rng)(void *, unsigned char *, size_t),
void* p_rng, unsigned char *seed, void* p_rng, const unsigned char *seed,
size_t seed_size ) size_t seed_size )
{ {
unsigned int idx = 0; unsigned int idx = 0;
@ -621,7 +621,7 @@ exit:
} }
int mbedtls_lms_calculate_public_key( mbedtls_lms_public_t *ctx, int mbedtls_lms_calculate_public_key( mbedtls_lms_public_t *ctx,
mbedtls_lms_private_t *priv_ctx ) const mbedtls_lms_private_t *priv_ctx )
{ {
unsigned char tree[MERKLE_TREE_NODE_AM_MAX][MBEDTLS_LMS_M_NODE_BYTES_MAX]; unsigned char tree[MERKLE_TREE_NODE_AM_MAX][MBEDTLS_LMS_M_NODE_BYTES_MAX];
int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED; int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
@ -662,7 +662,7 @@ int mbedtls_lms_calculate_public_key( mbedtls_lms_public_t *ctx,
} }
int mbedtls_lms_export_public_key( mbedtls_lms_public_t *ctx, int mbedtls_lms_export_public_key( const mbedtls_lms_public_t *ctx,
unsigned char *key, unsigned char *key,
size_t key_size, size_t *key_len ) size_t key_size, size_t *key_len )
{ {
@ -700,8 +700,9 @@ int mbedtls_lms_export_public_key( mbedtls_lms_public_t *ctx,
int mbedtls_lms_sign( mbedtls_lms_private_t *ctx, int mbedtls_lms_sign( mbedtls_lms_private_t *ctx,
int (*f_rng)(void *, unsigned char *, size_t), int (*f_rng)(void *, unsigned char *, size_t),
void* p_rng, unsigned char *msg, unsigned int msg_size, void* p_rng, const unsigned char *msg,
unsigned char *sig, size_t sig_size, size_t *sig_len ) unsigned int msg_size, unsigned char *sig, size_t sig_size,
size_t *sig_len )
{ {
uint32_t q_leaf_identifier; uint32_t q_leaf_identifier;
int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED; int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;