curve448: Use relative includes to avoid explicit dependencies

Signed-off-by: Amitay Isaacs <amitay@ozlabs.org>

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14784)
This commit is contained in:
Amitay Isaacs 2021-03-29 19:08:58 +11:00 committed by Matt Caswell
parent 5de32f22e7
commit 0f4286c78a
4 changed files with 3 additions and 10 deletions

View File

@ -87,10 +87,3 @@ GENERATE[ecp_nistz256-ppc64.s]=asm/ecp_nistz256-ppc64.pl
GENERATE[x25519-x86_64.s]=asm/x25519-x86_64.pl
GENERATE[x25519-ppc64.s]=asm/x25519-ppc64.pl
INCLUDE[curve448/arch_32/f_impl.o]=curve448/arch_32 curve448
INCLUDE[curve448/f_generic.o]=curve448/arch_32 curve448
INCLUDE[curve448/scalar.o]=curve448/arch_32 curve448
INCLUDE[curve448/curve448_tables.o]=curve448/arch_32 curve448
INCLUDE[curve448/eddsa.o]=curve448/arch_32 curve448
INCLUDE[curve448/curve448.o]=curve448/arch_32 curve448

View File

@ -10,7 +10,7 @@
* Originally written by Mike Hamburg
*/
#include "field.h"
#include "../field.h"
void gf_mul(gf_s * RESTRICT cs, const gf as, const gf bs)
{

View File

@ -66,7 +66,7 @@ void gf_serialize(uint8_t *serial, const gf x, int with_highbit);
mask_t gf_deserialize(gf x, const uint8_t serial[SER_BYTES], int with_hibit,
uint8_t hi_nmask);
# include "f_impl.h" /* Bring in the inline implementations */
# include "arch_32/f_impl.h" /* Bring in the inline implementations */
# define LIMBPERM(i) (i)
# define LIMB_MASK(i) (((1)<<LIMB_PLACE_VALUE(i))-1)

View File

@ -17,7 +17,7 @@
# include <assert.h>
# include <stdlib.h>
# include <openssl/e_os2.h>
# include "arch_intrinsics.h"
# include "arch_32/arch_intrinsics.h"
# include "curve448utils.h"
# if (ARCH_WORD_BITS == 64)