lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-07-30 22:43:08 +03:00
Code Activity

mbedtls_dhm_get_value parameter order: context first, output last

Browse Source 
mbedtls_dhm_get_value can be seen as either a copy function or a getter
function. Given the name and the semantics, it's more of a getter, even if
it "gets" by doing a copy. Therefore, put the context first, and the
selector next, leaving the output for last.

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
This commit is contained in:
Gilles Peskine
2021-06-11 21:59:08 +02:00
parent cadd3d860e
commit e5702489f5
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/mbedtls/dhm.h
View File

@ -315,18 +315,18 @@ size_t mbedtls_dhm_get_len( const mbedtls_dhm_context *ctx );
/** /**
* \brief This function copies a parameter of a DHM key. * \brief This function copies a parameter of a DHM key.
* *
* \param dest The MPI object to copy the value into. It must be
* initialized.
* \param ctx The DHM context to query. * \param ctx The DHM context to query.
* \param param The parameter to copy. * \param param The parameter to copy.
* \param dest The MPI object to copy the value into. It must be
* initialized.
* *
* \return \c 0 on success. * \return \c 0 on success.
* \return #MBEDTLS_ERR_DHM_BAD_INPUT_DATA if \p field is invalid. * \return #MBEDTLS_ERR_DHM_BAD_INPUT_DATA if \p field is invalid.
* \return An \c MBEDTLS_ERR_MPI_XXX error code if the copy fails. * \return An \c MBEDTLS_ERR_MPI_XXX error code if the copy fails.
*/ */
int mbedtls_dhm_get_value( mbedtls_mpi *dest, int mbedtls_dhm_get_value( const mbedtls_dhm_context *ctx,
const mbedtls_dhm_context *ctx, mbedtls_dhm_parameter param,
mbedtls_dhm_parameter param ); mbedtls_mpi *dest );
/** /**
* \brief This function frees and clears the components * \brief This function frees and clears the components

6
library/dhm.c
View File

@ -134,9 +134,9 @@ size_t mbedtls_dhm_get_len( const mbedtls_dhm_context *ctx )
return( mbedtls_mpi_size( &ctx->P ) ); return( mbedtls_mpi_size( &ctx->P ) );
} }
int mbedtls_dhm_get_value( mbedtls_mpi *dest, int mbedtls_dhm_get_value( const mbedtls_dhm_context *ctx,
const mbedtls_dhm_context *ctx, mbedtls_dhm_parameter param,
mbedtls_dhm_parameter param ) mbedtls_mpi *dest )
{ {
const mbedtls_mpi *src = NULL; const mbedtls_mpi *src = NULL;
switch( param ) switch( param )

8
library/ssl_tls.c
View File

@ -3871,10 +3871,10 @@ int mbedtls_ssl_conf_dh_param_ctx( mbedtls_ssl_config *conf, mbedtls_dhm_context
{ {
int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED; int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
if( ( ret = mbedtls_dhm_get_value( &conf->dhm_P, dhm_ctx, if( ( ret = mbedtls_dhm_get_value( dhm_ctx, MBEDTLS_DHM_PARAM_P,
MBEDTLS_DHM_PARAM_P ) ) != 0 || &conf->dhm_P ) ) != 0 ||
( ret = mbedtls_dhm_get_value( &conf->dhm_G, dhm_ctx, ( ret = mbedtls_dhm_get_value( dhm_ctx, MBEDTLS_DHM_PARAM_G,
MBEDTLS_DHM_PARAM_G ) ) != 0 ) &conf->dhm_G ) ) != 0 )
{ {
mbedtls_mpi_free( &conf->dhm_P ); mbedtls_mpi_free( &conf->dhm_P );
mbedtls_mpi_free( &conf->dhm_G ); mbedtls_mpi_free( &conf->dhm_G );

2
tests/suites/test_suite_dhm.function
View File

@ -9,7 +9,7 @@ int check_get_value( const mbedtls_dhm_context *ctx,
int ok = 0; int ok = 0;
mbedtls_mpi_init( &actual ); mbedtls_mpi_init( &actual );
TEST_ASSERT( mbedtls_dhm_get_value( &actual, ctx, param ) == 0 ); TEST_ASSERT( mbedtls_dhm_get_value( ctx, param, &actual ) == 0 );
TEST_ASSERT( mbedtls_mpi_cmp_mpi( &actual, expected ) == 0 ); TEST_ASSERT( mbedtls_mpi_cmp_mpi( &actual, expected ) == 0 );
ok = 1; ok = 1;