Rename mpi_mul_hlp -> mbedtls_mpi_core_mla and expose internally
This paves the way for the helper to be used from the ECP module Signed-off-by: Hanno Becker <hanno.becker@arm.com>
This commit is contained in:
Hanno Becker
parent
e141702551
commit
aef9cc4f96
2 changed files with 64 additions and 22 deletions
|
|
@ -38,6 +38,7 @@
|
|||
#if defined(MBEDTLS_BIGNUM_C)
|
||||
|
||||
#include "mbedtls/bignum.h"
|
||||
#include "bignum_internal.h"
|
||||
#include "bn_mul.h"
|
||||
#include "mbedtls/platform_util.h"
|
||||
#include "mbedtls/error.h"
|
||||
|
|
@ -1385,17 +1386,9 @@ int mbedtls_mpi_sub_int( mbedtls_mpi *X, const mbedtls_mpi *A, mbedtls_mpi_sint
|
|||
*
|
||||
* \return c The carry at the end of the operation.
|
||||
*/
|
||||
static
|
||||
#if defined(__APPLE__) && defined(__arm__)
|
||||
/*
|
||||
* Apple LLVM version 4.2 (clang-425.0.24) (based on LLVM 3.2svn)
|
||||
* appears to need this to prevent bad ARM code generation at -O3.
|
||||
*/
|
||||
__attribute__ ((noinline))
|
||||
#endif
|
||||
mbedtls_mpi_uint mpi_mul_hlp( mbedtls_mpi_uint *d, size_t d_len ,
|
||||
const mbedtls_mpi_uint *s, size_t s_len,
|
||||
mbedtls_mpi_uint b )
|
||||
mbedtls_mpi_uint mbedtls_mpi_core_mla( mbedtls_mpi_uint *d, size_t d_len ,
|
||||
const mbedtls_mpi_uint *s, size_t s_len,
|
||||
mbedtls_mpi_uint b )
|
||||
{
|
||||
mbedtls_mpi_uint c = 0; /* carry */
|
||||
|
||||
|
|
@ -1496,9 +1489,9 @@ int mbedtls_mpi_mul_mpi( mbedtls_mpi *X, const mbedtls_mpi *A, const mbedtls_mpi
|
|||
{
|
||||
/* We know that there cannot be any carry-out since we're
|
||||
* iterating from bottom to top. */
|
||||
(void) mpi_mul_hlp( X->p + k, i + 1,
|
||||
A->p, i,
|
||||
B->p[k] );
|
||||
(void) mbedtls_mpi_core_mla( X->p + k, i + 1,
|
||||
A->p, i,
|
||||
B->p[k] );
|
||||
}
|
||||
|
||||
/* If the result is 0, we don't shortcut the operation, which reduces
|
||||
|
|
@ -1529,7 +1522,7 @@ int mbedtls_mpi_mul_int( mbedtls_mpi *X, const mbedtls_mpi *A, mbedtls_mpi_uint
|
|||
if( b == 0 )
|
||||
return( mbedtls_mpi_lset( X, 0 ) );
|
||||
|
||||
/* Calculate A*b as A + A*(b-1) to take advantage of mpi_mul_hlp */
|
||||
/* Calculate A*b as A + A*(b-1) to take advantage of mbedtls_mpi_core_mla */
|
||||
int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
|
||||
/* In general, A * b requires 1 limb more than b. If
|
||||
* A->p[n - 1] * b / b == A->p[n - 1], then A * b fits in the same
|
||||
|
|
@ -1541,7 +1534,7 @@ int mbedtls_mpi_mul_int( mbedtls_mpi *X, const mbedtls_mpi *A, mbedtls_mpi_uint
|
|||
* grow to its final size. */
|
||||
MBEDTLS_MPI_CHK( mbedtls_mpi_grow( X, A->n + 1 ) );
|
||||
MBEDTLS_MPI_CHK( mbedtls_mpi_copy( X, A ) );
|
||||
mpi_mul_hlp( X->p, X->n, A->p, A->n, b - 1 );
|
||||
mbedtls_mpi_core_mla( X->p, X->n, A->p, A->n, b - 1 );
|
||||
|
||||
cleanup:
|
||||
return( ret );
|
||||
|
|
@ -1934,12 +1927,12 @@ static void mpi_montmul( mbedtls_mpi *A, const mbedtls_mpi *B, const mbedtls_mpi
|
|||
u0 = A->p[i];
|
||||
u1 = ( d[0] + u0 * B->p[0] ) * mm;
|
||||
|
||||
(void) mpi_mul_hlp( d, n + 2,
|
||||
B->p, m,
|
||||
u0 );
|
||||
(void) mpi_mul_hlp( d, n + 2,
|
||||
N->p, n,
|
||||
u1 );
|
||||
(void) mbedtls_mpi_core_mla( d, n + 2,
|
||||
B->p, m,
|
||||
u0 );
|
||||
(void) mbedtls_mpi_core_mla( d, n + 2,
|
||||
N->p, n,
|
||||
u1 );
|
||||
d++;
|
||||
}
|
||||
|
||||
|
|
|
|||
49
library/bignum_internal.h
Normal file
49
library/bignum_internal.h
Normal file
|
|
@ -0,0 +1,49 @@
|
|||
/**
|
||||
* Internal bignum functions
|
||||
*
|
||||
* 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.
|
||||
*/
|
||||
|
||||
#ifndef MBEDTLS_BIGNUM_INTERNAL_H
|
||||
#define MBEDTLS_BIGNUM_INTERNAL_H
|
||||
|
||||
#include "common.h"
|
||||
|
||||
#if defined(MBEDTLS_BIGNUM_C)
|
||||
#include "mbedtls/bignum.h"
|
||||
#endif
|
||||
|
||||
/** Helper for mbedtls_mpi multiplication.
|
||||
*
|
||||
* Add \p b * \p s to \p d.
|
||||
*
|
||||
* \param[in,out] d The bignum to add to.
|
||||
* \param d_len The number of limbs of \p d. This must be
|
||||
* at least \p s_len.
|
||||
* \param s_len The number of limbs of \p s.
|
||||
* \param[in] s A bignum to multiply, of size \p i.
|
||||
* It may overlap with \p d, but only if
|
||||
* \p d <= \p s.
|
||||
* Its leading limb must not be \c 0.
|
||||
* \param b A scalar to multiply.
|
||||
*
|
||||
* \return c The carry at the end of the operation.
|
||||
*/
|
||||
mbedtls_mpi_uint mbedtls_mpi_core_mla( mbedtls_mpi_uint *d, size_t d_len ,
|
||||
const mbedtls_mpi_uint *s, size_t s_len,
|
||||
mbedtls_mpi_uint b );
|
||||
|
||||
#endif /* MBEDTLS_BIGNUM_INTERNAL_H */
|
||||
Loading…
Reference in a new issue