Module Name: src
Committed By: christos
Date: Wed May 17 19:09:42 UTC 2023
Modified Files:
src/crypto/external/bsd/openssl/lib/libapps: Makefile
src/crypto/external/bsd/openssl/lib/libcommon: Makefile
src/crypto/external/bsd/openssl/lib/libcrypto: Makefile
src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64: ec.inc
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm: ec.inc
src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386: ec.inc
src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc: ec.inc
src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64: ec.inc
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc: ec.inc
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64: ec.inc
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64: ec.inc
src/crypto/external/bsd/openssl/lib/libdefault: Makefile
src/crypto/external/bsd/openssl/lib/liblegacy: Makefile
src/crypto/external/bsd/openssl/lib/libssl: Makefile
Log Message:
add missing assembly stub macro, remove WARNS=0
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/openssl/lib/libapps/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/lib/libcommon/Makefile
cvs rdiff -u -r1.27 -r1.28 \
src/crypto/external/bsd/openssl/lib/libcrypto/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/ec.inc
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ec.inc
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/ec.inc
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/ec.inc
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64/ec.inc
cvs rdiff -u -r1.7 -r1.8 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/ec.inc
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/ec.inc
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/ec.inc
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/lib/libdefault/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/lib/liblegacy/Makefile
cvs rdiff -u -r1.13 -r1.14 \
src/crypto/external/bsd/openssl/lib/libssl/Makefile
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/libapps/Makefile
diff -u src/crypto/external/bsd/openssl/lib/libapps/Makefile:1.1 src/crypto/external/bsd/openssl/lib/libapps/Makefile:1.2
--- src/crypto/external/bsd/openssl/lib/libapps/Makefile:1.1 Sun May 7 12:22:10 2023
+++ src/crypto/external/bsd/openssl/lib/libapps/Makefile Wed May 17 15:09:41 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2023/05/07 16:22:10 christos Exp $
+# $NetBSD: Makefile,v 1.2 2023/05/17 19:09:41 christos Exp $
# RCSid:
# Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp
@@ -25,8 +25,6 @@ USE_FIPS= no
.include <bsd.own.mk>
.include <bsd.shlib.mk>
-# XXX: There's a bit of work to do before we can enable warnings.
-WARNS=0
CWARNFLAGS.clang+= -Wno-empty-body -Wno-unused-value -Wno-parentheses -Wno-implicit-int-float-conversion
# XXX: This warning seems to trigger incorrectly
CWARNFLAGS.clang+= -Wno-atomic-alignment
Index: src/crypto/external/bsd/openssl/lib/libcommon/Makefile
diff -u src/crypto/external/bsd/openssl/lib/libcommon/Makefile:1.2 src/crypto/external/bsd/openssl/lib/libcommon/Makefile:1.3
--- src/crypto/external/bsd/openssl/lib/libcommon/Makefile:1.2 Tue May 16 15:06:09 2023
+++ src/crypto/external/bsd/openssl/lib/libcommon/Makefile Wed May 17 15:09:41 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2023/05/16 19:06:09 christos Exp $
+# $NetBSD: Makefile,v 1.3 2023/05/17 19:09:41 christos Exp $
# RCSid:
# Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp
@@ -25,8 +25,6 @@ USE_FIPS= no
.include <bsd.own.mk>
.include <bsd.shlib.mk>
-# XXX: There's a bit of work to do before we can enable warnings.
-WARNS=0
CWARNFLAGS.clang+= -Wno-empty-body -Wno-unused-value -Wno-parentheses -Wno-implicit-int-float-conversion
# XXX: This warning seems to trigger incorrectly
CWARNFLAGS.clang+= -Wno-atomic-alignment
Index: src/crypto/external/bsd/openssl/lib/libcrypto/Makefile
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/Makefile:1.27 src/crypto/external/bsd/openssl/lib/libcrypto/Makefile:1.28
--- src/crypto/external/bsd/openssl/lib/libcrypto/Makefile:1.27 Tue May 9 15:22:07 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/Makefile Wed May 17 15:09:41 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2023/05/09 19:22:07 christos Exp $
+# $NetBSD: Makefile,v 1.28 2023/05/17 19:09:41 christos Exp $
# RCSid:
# Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp
@@ -25,8 +25,8 @@ USE_FIPS= no
.include <bsd.own.mk>
.include <bsd.shlib.mk>
-# XXX: There's a bit of work to do before we can enable warnings.
-WARNS=0
+COPTS+= -Wno-error=cast-qual -Wno-error=discarded-qualifiers
+COPTS+= -Wno-error=missing-field-initializers -Wno-error=char-subscripts
CWARNFLAGS.clang+= -Wno-empty-body -Wno-unused-value -Wno-parentheses -Wno-implicit-int-float-conversion
# XXX: This warning seems to trigger incorrectly
CWARNFLAGS.clang+= -Wno-atomic-alignment
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/ec.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/ec.inc:1.2 src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/ec.inc:1.3
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/ec.inc:1.2 Thu May 11 10:36:11 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/ec.inc Wed May 17 15:09:41 2023
@@ -1,4 +1,5 @@
.PATH.S: ${.PARSEDIR}
+ECCPPFLAGS+=-DECP_NISTZ256_ASM
EC_SRCS += ecp_nistz256-armv8.S
ECNI = yes
.include "../../ec.inc"
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ec.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ec.inc:1.2 src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ec.inc:1.3
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ec.inc:1.2 Tue May 16 14:25:54 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ec.inc Wed May 17 15:09:41 2023
@@ -2,6 +2,7 @@
.if ${ARM_MAX_ARCH} >= 4
EC_SRCS += ecp_nistz256-armv4.S
+ECCPPFLAGS+= -DECP_NISTZ256_ASM
ECNI = yes
.endif
ECCPPFLAGS+= -DOPENSSL_NO_EC_NISTP_64_GCC_128
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/ec.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/ec.inc:1.3 src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/ec.inc:1.4
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/ec.inc:1.3 Sat May 13 09:43:25 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/ec.inc Wed May 17 15:09:41 2023
@@ -3,6 +3,7 @@ EC_SRCS += \
ecp_nistz256-x86.S
ECCPPFLAGS+= -DOPENSSL_NO_EC_NISTP_64_GCC_128
+ECCPPFLAGS+= -DECP_NISTZ256_ASM
ECNI = yes
.include "../../ec.inc"
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/ec.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/ec.inc:1.1 src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/ec.inc:1.2
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/ec.inc:1.1 Mon May 15 12:12:03 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/ec.inc Wed May 17 15:09:41 2023
@@ -1,3 +1,4 @@
ECCPPFLAGS+= -DOPENSSL_NO_EC_NISTP_64_GCC_128
+#ECCPPFLAGS+=-DECP_NISTZ256_ASM
.include "../../ec.inc"
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64/ec.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64/ec.inc:1.3 src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64/ec.inc:1.4
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64/ec.inc:1.3 Mon May 15 10:04:38 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64/ec.inc Wed May 17 15:09:41 2023
@@ -5,6 +5,7 @@ ecp_nistp521-ppc64.S \
ecp_ppc.c \
x25519-ppc64.S
+ECCPPFLAGS+= -DECP_NISTZ256_ASM
ECCPPFLAGS+= -DX25519_ASM
ECNI=yes
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.7 src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/ec.inc:1.8
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/ec.inc:1.7 Thu May 11 16:08:59 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/ec.inc Wed May 17 15:09:41 2023
@@ -3,6 +3,7 @@
EC_SRCS += \
ecp_nistz256-sparcv9.S
+ECCPPFLAGS+= -DECP_NISTZ256_ASM
ECNI = yes
AFLAGS.ecp_nistz256-sparcv9.S += -Wa,-Av9
.else
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/ec.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/ec.inc:1.1 src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/ec.inc:1.2
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/ec.inc:1.1 Sun Feb 18 18:38:47 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/ec.inc Wed May 17 15:09:42 2023
@@ -1,6 +1,7 @@
.PATH.S: ${.PARSEDIR}
EC_SRCS += \
ecp_nistz256-sparcv9.S
+ECCPPFLAGS+= -DECP_NISTZ256_ASM
ECNI = yes
.include "../../ec.inc"
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/ec.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/ec.inc:1.3 src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/ec.inc:1.4
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/ec.inc:1.3 Thu May 11 10:36:12 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/ec.inc Wed May 17 15:09:42 2023
@@ -3,6 +3,7 @@ EC_SRCS += \
ecp_nistz256-x86_64.S \
x25519-x86_64.S
+ECCPPFLAGS+= -DECP_NISTZ256_ASM
ECCPPFLAGS+= -DX25519_ASM -DOPENSSL_NO_EC_NISTP_64_GCC_128
ECNI = yes
Index: src/crypto/external/bsd/openssl/lib/libdefault/Makefile
diff -u src/crypto/external/bsd/openssl/lib/libdefault/Makefile:1.3 src/crypto/external/bsd/openssl/lib/libdefault/Makefile:1.4
--- src/crypto/external/bsd/openssl/lib/libdefault/Makefile:1.3 Tue May 9 15:22:07 2023
+++ src/crypto/external/bsd/openssl/lib/libdefault/Makefile Wed May 17 15:09:42 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2023/05/09 19:22:07 christos Exp $
+# $NetBSD: Makefile,v 1.4 2023/05/17 19:09:42 christos Exp $
# RCSid:
# Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp
@@ -25,8 +25,6 @@ USE_FIPS= no
.include <bsd.own.mk>
.include <bsd.shlib.mk>
-# XXX: There's a bit of work to do before we can enable warnings.
-WARNS=0
CWARNFLAGS.clang+= -Wno-empty-body -Wno-unused-value -Wno-parentheses -Wno-implicit-int-float-conversion
# XXX: This warning seems to trigger incorrectly
CWARNFLAGS.clang+= -Wno-atomic-alignment
Index: src/crypto/external/bsd/openssl/lib/liblegacy/Makefile
diff -u src/crypto/external/bsd/openssl/lib/liblegacy/Makefile:1.3 src/crypto/external/bsd/openssl/lib/liblegacy/Makefile:1.4
--- src/crypto/external/bsd/openssl/lib/liblegacy/Makefile:1.3 Tue May 16 15:06:09 2023
+++ src/crypto/external/bsd/openssl/lib/liblegacy/Makefile Wed May 17 15:09:42 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2023/05/16 19:06:09 christos Exp $
+# $NetBSD: Makefile,v 1.4 2023/05/17 19:09:42 christos Exp $
# RCSid:
# Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp
@@ -25,8 +25,6 @@ USE_FORT?= yes # cryptographic software
.include <bsd.own.mk>
.include <bsd.shlib.mk>
-# XXX: There's a bit of work to do before we can enable warnings.
-WARNS=0
CWARNFLAGS.clang+= -Wno-empty-body -Wno-unused-value -Wno-parentheses -Wno-implicit-int-float-conversion
# XXX: This warning seems to trigger incorrectly
CWARNFLAGS.clang+= -Wno-atomic-alignment
Index: src/crypto/external/bsd/openssl/lib/libssl/Makefile
diff -u src/crypto/external/bsd/openssl/lib/libssl/Makefile:1.13 src/crypto/external/bsd/openssl/lib/libssl/Makefile:1.14
--- src/crypto/external/bsd/openssl/lib/libssl/Makefile:1.13 Tue May 9 15:22:07 2023
+++ src/crypto/external/bsd/openssl/lib/libssl/Makefile Wed May 17 15:09:42 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2023/05/09 19:22:07 christos Exp $
+# $NetBSD: Makefile,v 1.14 2023/05/17 19:09:42 christos Exp $
# RCSid:
# Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp
@@ -20,8 +20,6 @@
USE_FORT?=yes # cryptographic software and network library
-# XXX There's a bit of work to do before we can enable warnings.
-WARNS=0
CWARNFLAGS.clang+= -Wno-unused-value
# XXX: This warning seems to trigger incorrectly
CWARNFLAGS.clang+= -Wno-atomic-alignment
