Bignum: extract bignum_mod_raw.h functions

Extract functions declared in bignum_mod_raw.h into a source file with a
matching name.

We are doing this because:

- This is a general best practice/convention
- We hope that this will make resolving merge conflicts in the future
  easier
- Having them in a unified source file is a premature optimisation at
  this point

Signed-off-by: Janos Follath <janos.follath@arm.com>
This commit is contained in:
Janos Follath 2022-08-09 13:34:54 +01:00
parent 3ca0775e59
commit 0ded631879
6 changed files with 95 additions and 46 deletions

View file

@ -2012,6 +2012,7 @@
* Module: library/bignum.c
* library/bignum_new.c
* library/bignum_core.c
* library/bignum_mod_raw.c
* Caller: library/dhm.c
* library/ecp.c
* library/ecdsa.c

View file

@ -20,6 +20,7 @@ set(src_crypto
bignum.c
bignum_new.c
bignum_core.c
bignum_mod_raw.c
camellia.c
ccm.c
chacha20.c

View file

@ -85,6 +85,7 @@ OBJS_CRYPTO= \
bignum.o \
bignum_new.o \
bignum_core.o \
bignum_mod_raw.o \
camellia.o \
ccm.o \
chacha20.o \

90
library/bignum_mod_raw.c Normal file
View file

@ -0,0 +1,90 @@
/*
* Multi-precision integer library
*
* Copyright The Mbed TLS Contributors
* SPDX-License-Identifier: Apache-2.0
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may
* not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "common.h"
#if defined(MBEDTLS_BIGNUM_C)
#include <string.h>
#include "mbedtls/error.h"
#include "mbedtls/platform_util.h"
#if defined(MBEDTLS_PLATFORM_C)
#include "mbedtls/platform.h"
#else
#include <stdio.h>
#include <stdlib.h>
#define mbedtls_printf printf
#define mbedtls_calloc calloc
#define mbedtls_free free
#endif
#include "bignum_core.h"
#include "bignum_mod_raw.h"
#include "bignum_mod.h"
#include "constant_time_internal.h"
int mbedtls_mpi_mod_raw_read( mbedtls_mpi_uint *X,
mbedtls_mpi_mod_modulus *m,
unsigned char *buf,
size_t buflen )
{
int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
if( m->ext_rep == MBEDTLS_MPI_MOD_EXT_REP_LE )
ret = mbedtls_mpi_core_read_le( X, m->n, buf, buflen );
else if( m->ext_rep == MBEDTLS_MPI_MOD_EXT_REP_BE )
ret = mbedtls_mpi_core_read_be( X, m->n, buf, buflen );
else
return( MBEDTLS_ERR_MPI_BAD_INPUT_DATA );
if( ret != 0 )
goto cleanup;
if( !mbedtls_mpi_core_lt_ct( X, m->p, m->n ) )
{
ret = MBEDTLS_ERR_MPI_BAD_INPUT_DATA;
goto cleanup;
}
cleanup:
return( ret );
}
int mbedtls_mpi_mod_raw_write( mbedtls_mpi_uint *X,
mbedtls_mpi_mod_modulus *m,
unsigned char *buf,
size_t buflen )
{
if( m->ext_rep == MBEDTLS_MPI_MOD_EXT_REP_LE )
return mbedtls_mpi_core_write_le( X, m->n, buf, buflen );
else if( m->ext_rep == MBEDTLS_MPI_MOD_EXT_REP_BE )
return mbedtls_mpi_core_write_be( X, m->n, buf, buflen );
else
return( MBEDTLS_ERR_MPI_BAD_INPUT_DATA );
return( 0 );
}
#endif /* MBEDTLS_BIGNUM_C */

View file

@ -26,6 +26,8 @@
#include "mbedtls/bignum.h"
#endif
#include "bignum_mod.h"
/** Import X from unsigned binary data.
*
* The MPI needs to have enough limbs to store the full value (in particular,

View file

@ -149,50 +149,4 @@ exit:
return( ret );
}
int mbedtls_mpi_mod_raw_read( mbedtls_mpi_uint *X,
mbedtls_mpi_mod_modulus *m,
unsigned char *buf,
size_t buflen )
{
int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
if( m->ext_rep == MBEDTLS_MPI_MOD_EXT_REP_LE )
ret = mbedtls_mpi_core_read_le( X, m->n, buf, buflen );
else if( m->ext_rep == MBEDTLS_MPI_MOD_EXT_REP_BE )
ret = mbedtls_mpi_core_read_be( X, m->n, buf, buflen );
else
return( MBEDTLS_ERR_MPI_BAD_INPUT_DATA );
if( ret != 0 )
goto cleanup;
if( !mbedtls_mpi_core_lt_ct( X, m->p, m->n ) )
{
ret = MBEDTLS_ERR_MPI_BAD_INPUT_DATA;
goto cleanup;
}
cleanup:
return( ret );
}
int mbedtls_mpi_mod_raw_write( mbedtls_mpi_uint *X,
mbedtls_mpi_mod_modulus *m,
unsigned char *buf,
size_t buflen )
{
if( m->ext_rep == MBEDTLS_MPI_MOD_EXT_REP_LE )
return mbedtls_mpi_core_write_le( X, m->n, buf, buflen );
else if( m->ext_rep == MBEDTLS_MPI_MOD_EXT_REP_BE )
return mbedtls_mpi_core_write_be( X, m->n, buf, buflen );
else
return( MBEDTLS_ERR_MPI_BAD_INPUT_DATA );
return( 0 );
}
#endif /* MBEDTLS_BIGNUM_C */