Module Name: src
Committed By: christos
Date: Thu May 11 20:09:00 UTC 2023
Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto: chacha.inc ec.inc
whrlpool.inc
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc: ec.inc
src/crypto/external/bsd/openssl/lib/libcrypto/arch/vax: crypto.inc
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64: whrlpool.inc
Added Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/vax: ec.inc
Removed Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64:
whrlpool.inc
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64: chacha.inc
whrlpool.inc
Log Message:
fix vax, restructure.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/lib/libcrypto/chacha.inc \
src/crypto/external/bsd/openssl/lib/libcrypto/whrlpool.inc
cvs rdiff -u -r1.10 -r1.11 \
src/crypto/external/bsd/openssl/lib/libcrypto/ec.inc
cvs rdiff -u -r1.1 -r0 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/whrlpool.inc
cvs rdiff -u -r1.6 -r1.7 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/ec.inc
cvs rdiff -u -r1.1 -r0 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/chacha.inc \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/whrlpool.inc
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/vax/crypto.inc
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/vax/ec.inc
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/whrlpool.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/chacha.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/chacha.inc:1.3 src/crypto/external/bsd/openssl/lib/libcrypto/chacha.inc:1.4
--- src/crypto/external/bsd/openssl/lib/libcrypto/chacha.inc:1.3 Sat May 6 13:07:22 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/chacha.inc Thu May 11 16:08:59 2023
@@ -1,8 +1,8 @@
-# $NetBSD: chacha.inc,v 1.3 2023/05/06 17:07:22 christos Exp $
+# $NetBSD: chacha.inc,v 1.4 2023/05/11 20:08:59 christos Exp $
.PATH: ${OPENSSLSRC}/crypto/chacha
-CHACHA_SRCS += \
+CHACHA_SRCS ?= chacha_enc.c
SRCS += ${CHACHA_SRCS}
Index: src/crypto/external/bsd/openssl/lib/libcrypto/whrlpool.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/whrlpool.inc:1.3 src/crypto/external/bsd/openssl/lib/libcrypto/whrlpool.inc:1.4
--- src/crypto/external/bsd/openssl/lib/libcrypto/whrlpool.inc:1.3 Sat May 6 13:07:23 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/whrlpool.inc Thu May 11 16:08:59 2023
@@ -1,7 +1,8 @@
-# $NetBSD: whrlpool.inc,v 1.3 2023/05/06 17:07:23 christos Exp $
+# $NetBSD: whrlpool.inc,v 1.4 2023/05/11 20:08:59 christos Exp $
.PATH: ${OPENSSLSRC}/crypto/whrlpool
+WHRLPOOL_SRCS ?= wp_block.c
WHRLPOOL_SRCS += \
wp_dgst.c \
Index: src/crypto/external/bsd/openssl/lib/libcrypto/ec.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/ec.inc:1.10 src/crypto/external/bsd/openssl/lib/libcrypto/ec.inc:1.11
--- src/crypto/external/bsd/openssl/lib/libcrypto/ec.inc:1.10 Thu May 11 11:26:13 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/ec.inc Thu May 11 16:08:59 2023
@@ -1,4 +1,4 @@
-# $NetBSD: ec.inc,v 1.10 2023/05/11 15:26:13 christos Exp $
+# $NetBSD: ec.inc,v 1.11 2023/05/11 20:08:59 christos Exp $
.PATH: ${OPENSSLSRC}/crypto/ec
@@ -38,8 +38,10 @@ ecx_meth.c \
.if defined(ECNI)
COPTS.ecp_nistz256.c+=-Wno-error=stack-protector
EC_SRCS+= ecp_nistz256.c
+.if empty(ECCPPFLAGS:M*OPENSSL_NO_EC_NISTP_64_GCC_128*)
EC_SRCS+= ecp_nistp224.c ecp_nistp256.c ecp_nistp521.c ecp_nistputil.c
.endif
+.endif
SRCS += ${EC_SRCS}
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/ec.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/ec.inc:1.6 src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/ec.inc:1.7
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/ec.inc:1.6 Sun Feb 25 20:33:05 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/ec.inc Thu May 11 16:08:59 2023
@@ -8,4 +8,6 @@ AFLAGS.ecp_nistz256-sparcv9.S += -Wa,-Av
.else
.endif
+ECCPPFLAGS+= -DOPENSSL_NO_EC_NISTP_64_GCC_128
+
.include "../../ec.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.4 src/crypto/external/bsd/openssl/lib/libcrypto/arch/vax/crypto.inc:1.5
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/vax/crypto.inc:1.4 Sat May 9 09:16:42 2020
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/vax/crypto.inc Thu May 11 16:09:00 2023
@@ -2,5 +2,7 @@
#CRYPTO_SRCS += libc-memequal.c
#CPPFLAGS += -DOPENSSL_CPUID_OBJ
+COPTS.threads_pthread.c += -DBROKEN_CLANG_ATOMICS # no atomic 64 bit ops
+
.include "../../crypto.inc"
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/whrlpool.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/whrlpool.inc:1.1 src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/whrlpool.inc:1.2
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/whrlpool.inc:1.1 Sat May 16 15:33:59 2015
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/whrlpool.inc Thu May 11 16:09:00 2023
@@ -1,4 +1,4 @@
.PATH.S: ${.PARSEDIR}
-WHRLPOOL_SRCS = wp-x86_64.S
+WHRLPOOL_SRCS += wp-x86_64.S
WHRLPOOLCPPFLAGS+= -DWHIRLPOOL_ASM
.include "../../whrlpool.inc"
Added files:
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/vax/ec.inc
diff -u /dev/null src/crypto/external/bsd/openssl/lib/libcrypto/arch/vax/ec.inc:1.1
--- /dev/null Thu May 11 16:09:00 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/vax/ec.inc Thu May 11 16:09:00 2023
@@ -0,0 +1,2 @@
+ECCPPFLAGS+= -DOPENSSL_NO_EC_NISTP_64_GCC_128
+.include "../../ec.inc"
