From ed78d1de0fca27d07d6be2e375beb03891ddfd56 Mon Sep 17 00:00:00 2001 From: christos Date: Mon, 24 Sep 2018 11:03:39 +0000 Subject: [PATCH] Don't include the libc CRYPTO_memcmp file (it has a different prototype now) and it is provided by openssl in C, or use the assembly versions. --- .../external/bsd/openssl/lib/libcrypto/arch/aarch64/crypto.inc | 1 + crypto/external/bsd/openssl/lib/libcrypto/arch/alpha/crypto.inc | 1 + crypto/external/bsd/openssl/lib/libcrypto/arch/hppa/crypto.inc | 2 +- crypto/external/bsd/openssl/lib/libcrypto/arch/m68k/crypto.inc | 2 +- crypto/external/bsd/openssl/lib/libcrypto/arch/mips/crypto.inc | 1 - .../external/bsd/openssl/lib/libcrypto/arch/powerpc/crypto.inc | 1 + .../bsd/openssl/lib/libcrypto/arch/powerpc64/crypto.inc | 1 + crypto/external/bsd/openssl/lib/libcrypto/arch/sh3/crypto.inc | 2 +- crypto/external/bsd/openssl/lib/libcrypto/arch/vax/crypto.inc | 1 + 9 files changed, 8 insertions(+), 4 deletions(-) diff --git a/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/crypto.inc b/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/crypto.inc index 50d651094614..354354b18955 100644 --- a/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/crypto.inc +++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/crypto.inc @@ -1,5 +1,6 @@ .PATH.S: ${.PARSEDIR} CPUID_SRCS += arm64cpuid.S armcap.c +CRYPTOCPPFLAGS += -DOPENSSL_CPUID_OBJ CPUID = yes ARM_MAX_ARCH=8 CPPFLAGS += -D__ARM_MAX_ARCH__=${ARM_MAX_ARCH} diff --git a/crypto/external/bsd/openssl/lib/libcrypto/arch/alpha/crypto.inc b/crypto/external/bsd/openssl/lib/libcrypto/arch/alpha/crypto.inc index 6704c8a782d3..1261e4d1af1e 100644 --- a/crypto/external/bsd/openssl/lib/libcrypto/arch/alpha/crypto.inc +++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/alpha/crypto.inc @@ -5,6 +5,7 @@ ASMDIR:=${.PARSEDIR} CPUID_SRCS += alpha-mont.S alphacpuid.S CPUID = yes CPPFLAGS += -DOPENSSL_BN_ASM_MONT -I${ASMDIR} +CRYPTOCPPFLAGS += -DOPENSSL_CPUID_OBJ .include "../../crypto.inc" diff --git a/crypto/external/bsd/openssl/lib/libcrypto/arch/hppa/crypto.inc b/crypto/external/bsd/openssl/lib/libcrypto/arch/hppa/crypto.inc index bf1ee572951a..f11af6484351 100644 --- a/crypto/external/bsd/openssl/lib/libcrypto/arch/hppa/crypto.inc +++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/hppa/crypto.inc @@ -1,3 +1,3 @@ -CRYPTO_SRCS += libc-memequal.c +#CRYPTO_SRCS += libc-memequal.c .include "../../crypto.inc" diff --git a/crypto/external/bsd/openssl/lib/libcrypto/arch/m68k/crypto.inc b/crypto/external/bsd/openssl/lib/libcrypto/arch/m68k/crypto.inc index ae8db6b4ec8e..8446d9707dcf 100644 --- a/crypto/external/bsd/openssl/lib/libcrypto/arch/m68k/crypto.inc +++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/m68k/crypto.inc @@ -1,5 +1,5 @@ .PATH.S: ${.PARSEDIR} -CRYPTO_SRCS += libc-memequal.c +#CRYPTO_SRCS += libc-memequal.c .include "../../crypto.inc" diff --git a/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/crypto.inc b/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/crypto.inc index b6cdbdde407a..b30028c83182 100644 --- a/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/crypto.inc +++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/crypto.inc @@ -3,6 +3,5 @@ CRYPTO_SRCS += mips-mont${"${COPTS:M*-mabi=64*}" == "":?:64}.S .endif -CRYPTO_SRCS += libc-memequal.c .include "../../crypto.inc" diff --git a/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/crypto.inc b/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/crypto.inc index e9d272193793..60559ffd036f 100644 --- a/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/crypto.inc +++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/crypto.inc @@ -1,3 +1,4 @@ CPUID_SRCS = ppccap.c ppccpuid.S +CRYPTOCPPFLAGS += -DOPENSSL_CPUID_OBJ CPUID = yes .include "../../crypto.inc" diff --git a/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64/crypto.inc b/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64/crypto.inc index e9d272193793..60559ffd036f 100644 --- a/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64/crypto.inc +++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64/crypto.inc @@ -1,3 +1,4 @@ CPUID_SRCS = ppccap.c ppccpuid.S +CRYPTOCPPFLAGS += -DOPENSSL_CPUID_OBJ CPUID = yes .include "../../crypto.inc" diff --git a/crypto/external/bsd/openssl/lib/libcrypto/arch/sh3/crypto.inc b/crypto/external/bsd/openssl/lib/libcrypto/arch/sh3/crypto.inc index bf1ee572951a..f11af6484351 100644 --- a/crypto/external/bsd/openssl/lib/libcrypto/arch/sh3/crypto.inc +++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/sh3/crypto.inc @@ -1,3 +1,3 @@ -CRYPTO_SRCS += libc-memequal.c +#CRYPTO_SRCS += libc-memequal.c .include "../../crypto.inc" diff --git a/crypto/external/bsd/openssl/lib/libcrypto/arch/vax/crypto.inc b/crypto/external/bsd/openssl/lib/libcrypto/arch/vax/crypto.inc index ae8db6b4ec8e..5eeaaaba7a9b 100644 --- a/crypto/external/bsd/openssl/lib/libcrypto/arch/vax/crypto.inc +++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/vax/crypto.inc @@ -1,5 +1,6 @@ .PATH.S: ${.PARSEDIR} CRYPTO_SRCS += libc-memequal.c +CRYPTOCPPFLAGS += -DOPENSSL_CPUID_OBJ .include "../../crypto.inc"