do not call memcpy directly in curve25519_64_adx.h Change-Id: I7837e600cb5f22aab38cb332de6f579d3cd62a67 Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/63745 Reviewed-by: David Benjamin <davidben@google.com> Commit-Queue: David Benjamin <davidben@google.com>
diff --git a/third_party/fiat/curve25519_64_adx.h b/third_party/fiat/curve25519_64_adx.h index f50f5b8..8acfc1b 100644 --- a/third_party/fiat/curve25519_64_adx.h +++ b/third_party/fiat/curve25519_64_adx.h
@@ -1,7 +1,9 @@ +#include <openssl/base.h> +#include "../../crypto/internal.h" + #include <stdbool.h> #include <stdint.h> #include <immintrin.h> -#include <string.h> typedef uint64_t fe4[4]; typedef uint8_t fiat_uint1; @@ -468,7 +470,7 @@ void x25519_scalar_mult_adx(uint8_t out[32], const uint8_t scalar[32], const uint8_t point[32]) { uint8_t e[32]; - memcpy(e, scalar, 32); + OPENSSL_memcpy(e, scalar, 32); e[0] &= 248; e[31] &= 127; e[31] |= 64;
diff --git a/third_party/fiat/p256_64.h b/third_party/fiat/p256_64.h index a691407..6667b31 100644 --- a/third_party/fiat/p256_64.h +++ b/third_party/fiat/p256_64.h
@@ -1,3 +1,4 @@ +#include <openssl/base.h> #include "../../crypto/internal.h" #if !defined(OPENSSL_NO_ASM) && defined(__GNUC__) && defined(__x86_64__) void fiat_p256_adx_mul(uint64_t*, const uint64_t*, const uint64_t*);