diff options
| author | Amitay Isaacs <amitay@ozlabs.org> | 2021-03-29 19:08:58 +1100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2021-04-08 12:18:09 +0100 |
| commit | 0f4286c78a657958bcd5cee38a8d131b4bb2582a (patch) | |
| tree | 0c96aa4b16ee8efd9d7de5d198f4b5733a8441df /crypto/ec | |
| parent | 5de32f22e731ea151e1c5aac7703cde2573cb4a4 (diff) | |
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)
Diffstat (limited to 'crypto/ec')
| -rw-r--r-- | crypto/ec/build.info | 7 | ||||
| -rw-r--r-- | crypto/ec/curve448/arch_32/f_impl.c | 2 | ||||
| -rw-r--r-- | crypto/ec/curve448/field.h | 2 | ||||
| -rw-r--r-- | crypto/ec/curve448/word.h | 2 |
4 files changed, 3 insertions, 10 deletions
diff --git a/crypto/ec/build.info b/crypto/ec/build.info index fff3ab1e1c..f6d8283649 100644 --- a/crypto/ec/build.info +++ b/crypto/ec/build.info @@ -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 diff --git a/crypto/ec/curve448/arch_32/f_impl.c b/crypto/ec/curve448/arch_32/f_impl.c index 11aa768f2a..7263ce233d 100644 --- a/crypto/ec/curve448/arch_32/f_impl.c +++ b/crypto/ec/curve448/arch_32/f_impl.c @@ -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) { diff --git a/crypto/ec/curve448/field.h b/crypto/ec/curve448/field.h index 9d6ee1cacc..71349e45a1 100644 --- a/crypto/ec/curve448/field.h +++ b/crypto/ec/curve448/field.h @@ -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) diff --git a/crypto/ec/curve448/word.h b/crypto/ec/curve448/word.h index 6e007c3735..06555cf329 100644 --- a/crypto/ec/curve448/word.h +++ b/crypto/ec/curve448/word.h @@ -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) |