mirror of
https://github.com/yuzu-emu/mbedtls.git
synced 2024-11-27 09:14:18 +01:00
Move mpi constant macros to bn_mul.h
Signed-off-by: Janos Follath <janos.follath@arm.com>
This commit is contained in:
Janos Follath
parent
d31a30c083
commit
bc96a79854
@ -44,6 +44,46 @@
|
|||||||
|
|
||||||
#include "mbedtls/bignum.h"
|
#include "mbedtls/bignum.h"
|
||||||
|
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Conversion macros for embedded constants:
|
||||||
|
* build lists of mbedtls_mpi_uint's from lists of unsigned char's grouped by 8, 4 or 2
|
||||||
|
*/
|
||||||
|
#if defined(MBEDTLS_HAVE_INT32)
|
||||||
|
|
||||||
|
#define BYTES_TO_T_UINT_4( a, b, c, d ) \
|
||||||
|
( (mbedtls_mpi_uint) (a) << 0 ) | \
|
||||||
|
( (mbedtls_mpi_uint) (b) << 8 ) | \
|
||||||
|
( (mbedtls_mpi_uint) (c) << 16 ) | \
|
||||||
|
( (mbedtls_mpi_uint) (d) << 24 )
|
||||||
|
|
||||||
|
#define BYTES_TO_T_UINT_2( a, b ) \
|
||||||
|
BYTES_TO_T_UINT_4( a, b, 0, 0 )
|
||||||
|
|
||||||
|
#define BYTES_TO_T_UINT_8( a, b, c, d, e, f, g, h ) \
|
||||||
|
BYTES_TO_T_UINT_4( a, b, c, d ), \
|
||||||
|
BYTES_TO_T_UINT_4( e, f, g, h )
|
||||||
|
|
||||||
|
#else /* 64-bits */
|
||||||
|
|
||||||
|
#define BYTES_TO_T_UINT_8( a, b, c, d, e, f, g, h ) \
|
||||||
|
( (mbedtls_mpi_uint) (a) << 0 ) | \
|
||||||
|
( (mbedtls_mpi_uint) (b) << 8 ) | \
|
||||||
|
( (mbedtls_mpi_uint) (c) << 16 ) | \
|
||||||
|
( (mbedtls_mpi_uint) (d) << 24 ) | \
|
||||||
|
( (mbedtls_mpi_uint) (e) << 32 ) | \
|
||||||
|
( (mbedtls_mpi_uint) (f) << 40 ) | \
|
||||||
|
( (mbedtls_mpi_uint) (g) << 48 ) | \
|
||||||
|
( (mbedtls_mpi_uint) (h) << 56 )
|
||||||
|
|
||||||
|
#define BYTES_TO_T_UINT_4( a, b, c, d ) \
|
||||||
|
BYTES_TO_T_UINT_8( a, b, c, d, 0, 0, 0, 0 )
|
||||||
|
|
||||||
|
#define BYTES_TO_T_UINT_2( a, b ) \
|
||||||
|
BYTES_TO_T_UINT_8( a, b, 0, 0, 0, 0, 0, 0 )
|
||||||
|
|
||||||
|
#endif /* bits in mbedtls_mpi_uint */
|
||||||
|
|
||||||
#if defined(MBEDTLS_HAVE_ASM)
|
#if defined(MBEDTLS_HAVE_ASM)
|
||||||
|
|
||||||
#ifndef asm
|
#ifndef asm
|
||||||
|
|||||||
@ -76,6 +76,7 @@
|
|||||||
#include "mbedtls/threading.h"
|
#include "mbedtls/threading.h"
|
||||||
#include "mbedtls/platform_util.h"
|
#include "mbedtls/platform_util.h"
|
||||||
#include "mbedtls/error.h"
|
#include "mbedtls/error.h"
|
||||||
|
#include "mbedtls/bn_mul.h"
|
||||||
|
|
||||||
#include "ecp_invasive.h"
|
#include "ecp_invasive.h"
|
||||||
|
|
||||||
@ -2936,22 +2937,6 @@ int mbedtls_ecp_muladd( mbedtls_ecp_group *grp, mbedtls_ecp_point *R,
|
|||||||
|
|
||||||
#if defined(MBEDTLS_ECP_MONTGOMERY_ENABLED)
|
#if defined(MBEDTLS_ECP_MONTGOMERY_ENABLED)
|
||||||
#if defined(MBEDTLS_ECP_DP_CURVE25519_ENABLED)
|
#if defined(MBEDTLS_ECP_DP_CURVE25519_ENABLED)
|
||||||
/* Duplicated macros from ecp_curves.c */
|
|
||||||
#if defined(MBEDTLS_HAVE_INT32)
|
|
||||||
#define BYTES_TO_T_UINT_8( a, b, c, d, e, f, g, h ) \
|
|
||||||
BYTES_TO_T_UINT_4( a, b, c, d ), \
|
|
||||||
BYTES_TO_T_UINT_4( e, f, g, h )
|
|
||||||
#else /* 64-bits */
|
|
||||||
#define BYTES_TO_T_UINT_8( a, b, c, d, e, f, g, h ) \
|
|
||||||
( (mbedtls_mpi_uint) (a) << 0 ) | \
|
|
||||||
( (mbedtls_mpi_uint) (b) << 8 ) | \
|
|
||||||
( (mbedtls_mpi_uint) (c) << 16 ) | \
|
|
||||||
( (mbedtls_mpi_uint) (d) << 24 ) | \
|
|
||||||
( (mbedtls_mpi_uint) (e) << 32 ) | \
|
|
||||||
( (mbedtls_mpi_uint) (f) << 40 ) | \
|
|
||||||
( (mbedtls_mpi_uint) (g) << 48 ) | \
|
|
||||||
( (mbedtls_mpi_uint) (h) << 56 )
|
|
||||||
#endif /* bits in mbedtls_mpi_uint */
|
|
||||||
#define ECP_MPI_INIT(s, n, p) {s, (n), (mbedtls_mpi_uint *)(p)}
|
#define ECP_MPI_INIT(s, n, p) {s, (n), (mbedtls_mpi_uint *)(p)}
|
||||||
#define ECP_MPI_INIT_ARRAY(x) \
|
#define ECP_MPI_INIT_ARRAY(x) \
|
||||||
ECP_MPI_INIT(1, sizeof(x) / sizeof(mbedtls_mpi_uint), x)
|
ECP_MPI_INIT(1, sizeof(x) / sizeof(mbedtls_mpi_uint), x)
|
||||||
|
|||||||
@ -24,6 +24,7 @@
|
|||||||
#include "mbedtls/ecp.h"
|
#include "mbedtls/ecp.h"
|
||||||
#include "mbedtls/platform_util.h"
|
#include "mbedtls/platform_util.h"
|
||||||
#include "mbedtls/error.h"
|
#include "mbedtls/error.h"
|
||||||
|
#include "mbedtls/bn_mul.h"
|
||||||
|
|
||||||
#include "ecp_invasive.h"
|
#include "ecp_invasive.h"
|
||||||
|
|
||||||
@ -42,45 +43,6 @@
|
|||||||
#define inline __inline
|
#define inline __inline
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*
|
|
||||||
* Conversion macros for embedded constants:
|
|
||||||
* build lists of mbedtls_mpi_uint's from lists of unsigned char's grouped by 8, 4 or 2
|
|
||||||
*/
|
|
||||||
#if defined(MBEDTLS_HAVE_INT32)
|
|
||||||
|
|
||||||
#define BYTES_TO_T_UINT_4( a, b, c, d ) \
|
|
||||||
( (mbedtls_mpi_uint) (a) << 0 ) | \
|
|
||||||
( (mbedtls_mpi_uint) (b) << 8 ) | \
|
|
||||||
( (mbedtls_mpi_uint) (c) << 16 ) | \
|
|
||||||
( (mbedtls_mpi_uint) (d) << 24 )
|
|
||||||
|
|
||||||
#define BYTES_TO_T_UINT_2( a, b ) \
|
|
||||||
BYTES_TO_T_UINT_4( a, b, 0, 0 )
|
|
||||||
|
|
||||||
#define BYTES_TO_T_UINT_8( a, b, c, d, e, f, g, h ) \
|
|
||||||
BYTES_TO_T_UINT_4( a, b, c, d ), \
|
|
||||||
BYTES_TO_T_UINT_4( e, f, g, h )
|
|
||||||
|
|
||||||
#else /* 64-bits */
|
|
||||||
|
|
||||||
#define BYTES_TO_T_UINT_8( a, b, c, d, e, f, g, h ) \
|
|
||||||
( (mbedtls_mpi_uint) (a) << 0 ) | \
|
|
||||||
( (mbedtls_mpi_uint) (b) << 8 ) | \
|
|
||||||
( (mbedtls_mpi_uint) (c) << 16 ) | \
|
|
||||||
( (mbedtls_mpi_uint) (d) << 24 ) | \
|
|
||||||
( (mbedtls_mpi_uint) (e) << 32 ) | \
|
|
||||||
( (mbedtls_mpi_uint) (f) << 40 ) | \
|
|
||||||
( (mbedtls_mpi_uint) (g) << 48 ) | \
|
|
||||||
( (mbedtls_mpi_uint) (h) << 56 )
|
|
||||||
|
|
||||||
#define BYTES_TO_T_UINT_4( a, b, c, d ) \
|
|
||||||
BYTES_TO_T_UINT_8( a, b, c, d, 0, 0, 0, 0 )
|
|
||||||
|
|
||||||
#define BYTES_TO_T_UINT_2( a, b ) \
|
|
||||||
BYTES_TO_T_UINT_8( a, b, 0, 0, 0, 0, 0, 0 )
|
|
||||||
|
|
||||||
#endif /* bits in mbedtls_mpi_uint */
|
|
||||||
|
|
||||||
#define ECP_MPI_INIT(s, n, p) {s, (n), (mbedtls_mpi_uint *)(p)}
|
#define ECP_MPI_INIT(s, n, p) {s, (n), (mbedtls_mpi_uint *)(p)}
|
||||||
|
|
||||||
#define ECP_MPI_INIT_ARRAY(x) \
|
#define ECP_MPI_INIT_ARRAY(x) \
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user