Module Name: src
Committed By: christos
Date: Mon Sep 24 11:03:40 UTC 2018
Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64: crypto.inc
src/crypto/external/bsd/openssl/lib/libcrypto/arch/alpha: crypto.inc
src/crypto/external/bsd/openssl/lib/libcrypto/arch/hppa: crypto.inc
src/crypto/external/bsd/openssl/lib/libcrypto/arch/m68k: crypto.inc
src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips: crypto.inc
src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc: crypto.inc
src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64:
crypto.inc
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sh3: crypto.inc
src/crypto/external/bsd/openssl/lib/libcrypto/arch/vax: crypto.inc
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/crypto.inc
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/alpha/crypto.inc
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/hppa/crypto.inc
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/m68k/crypto.inc
cvs rdiff -u -r1.6 -r1.7 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/crypto.inc
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/crypto.inc
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64/crypto.inc
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sh3/crypto.inc
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/vax/crypto.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/crypto.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/crypto.inc:1.3 src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/crypto.inc:1.4
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/crypto.inc:1.3 Sun Jul 15 20:08:12 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/crypto.inc Mon Sep 24 07:03:39 2018
@@ -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}
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/alpha/crypto.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/alpha/crypto.inc:1.1 src/crypto/external/bsd/openssl/lib/libcrypto/arch/alpha/crypto.inc:1.2
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/alpha/crypto.inc:1.1 Sat Mar 3 23:00:45 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/alpha/crypto.inc Mon Sep 24 07:03:39 2018
@@ -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"
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/hppa/crypto.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/hppa/crypto.inc:1.1 src/crypto/external/bsd/openssl/lib/libcrypto/arch/hppa/crypto.inc:1.2
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/hppa/crypto.inc:1.1 Tue Mar 6 14:30:56 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/hppa/crypto.inc Mon Sep 24 07:03:39 2018
@@ -1,3 +1,3 @@
-CRYPTO_SRCS += libc-memequal.c
+#CRYPTO_SRCS += libc-memequal.c
.include "../../crypto.inc"
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/m68k/crypto.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/m68k/crypto.inc:1.1 src/crypto/external/bsd/openssl/lib/libcrypto/arch/m68k/crypto.inc:1.2
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/m68k/crypto.inc:1.1 Sun Mar 4 20:00:12 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/m68k/crypto.inc Mon Sep 24 07:03:39 2018
@@ -1,5 +1,5 @@
.PATH.S: ${.PARSEDIR}
-CRYPTO_SRCS += libc-memequal.c
+#CRYPTO_SRCS += libc-memequal.c
.include "../../crypto.inc"
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/crypto.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/crypto.inc:1.6 src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/crypto.inc:1.7
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/crypto.inc:1.6 Fri Mar 9 16:49:55 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/crypto.inc Mon Sep 24 07:03:40 2018
@@ -3,6 +3,5 @@
CRYPTO_SRCS += mips-mont${"${COPTS:M*-mabi=64*}" == "":?:64}.S
.endif
-CRYPTO_SRCS += libc-memequal.c
.include "../../crypto.inc"
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/crypto.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/crypto.inc:1.2 src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/crypto.inc:1.3
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/crypto.inc:1.2 Fri Jul 27 19:01:23 2012
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/crypto.inc Mon Sep 24 07:03:40 2018
@@ -1,3 +1,4 @@
CPUID_SRCS = ppccap.c ppccpuid.S
+CRYPTOCPPFLAGS += -DOPENSSL_CPUID_OBJ
CPUID = yes
.include "../../crypto.inc"
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64/crypto.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64/crypto.inc:1.1 src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64/crypto.inc:1.2
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64/crypto.inc:1.1 Sat Oct 15 08:19:02 2016
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64/crypto.inc Mon Sep 24 07:03:40 2018
@@ -1,3 +1,4 @@
CPUID_SRCS = ppccap.c ppccpuid.S
+CRYPTOCPPFLAGS += -DOPENSSL_CPUID_OBJ
CPUID = yes
.include "../../crypto.inc"
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/sh3/crypto.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/sh3/crypto.inc:1.1 src/crypto/external/bsd/openssl/lib/libcrypto/arch/sh3/crypto.inc:1.2
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/sh3/crypto.inc:1.1 Fri Mar 2 23:32:46 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/sh3/crypto.inc Mon Sep 24 07:03:40 2018
@@ -1,3 +1,3 @@
-CRYPTO_SRCS += libc-memequal.c
+#CRYPTO_SRCS += libc-memequal.c
.include "../../crypto.inc"
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/vax/crypto.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/vax/crypto.inc:1.1 src/crypto/external/bsd/openssl/lib/libcrypto/arch/vax/crypto.inc:1.2
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/vax/crypto.inc:1.1 Wed Mar 7 22:15:08 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/vax/crypto.inc Mon Sep 24 07:03:40 2018
@@ -1,5 +1,6 @@
.PATH.S: ${.PARSEDIR}
CRYPTO_SRCS += libc-memequal.c
+CRYPTOCPPFLAGS += -DOPENSSL_CPUID_OBJ
.include "../../crypto.inc"
