[src/trunk]: src/crypto/external/bsd/openssl changes to get aarch64 to link

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b0eb988b6ca1
branches:  trunk
changeset: 374760:b0eb988b6ca1
user:      christos <christos%NetBSD.org@localhost>
date:      Thu May 11 14:36:11 2023 +0000

description:
changes to get aarch64 to link

diffstat:

 crypto/external/bsd/openssl/include/openssl/configuration.h      |  2 ++
 crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/ec.inc    |  2 +-
 crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/modes.inc |  1 -
 crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/ec.inc     |  2 +-
 crypto/external/bsd/openssl/lib/libcrypto/ec.inc                 |  4 ++--
 5 files changed, 6 insertions(+), 5 deletions(-)

diffs (62 lines):

diff -r 9fb4e510a06c -r b0eb988b6ca1 crypto/external/bsd/openssl/include/openssl/configuration.h
--- a/crypto/external/bsd/openssl/include/openssl/configuration.h       Thu May 11 14:34:30 2023 +0000
+++ b/crypto/external/bsd/openssl/include/openssl/configuration.h       Thu May 11 14:36:11 2023 +0000
@@ -49,9 +49,11 @@ extern "C" {
 # ifndef OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE
 #  define OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE
 # endif
+#if 0
 # ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
 #  define OPENSSL_NO_EC_NISTP_64_GCC_128
 # endif
+#endif
 # ifndef OPENSSL_NO_EGD
 #  define OPENSSL_NO_EGD
 # endif
diff -r 9fb4e510a06c -r b0eb988b6ca1 crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/ec.inc
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/ec.inc     Thu May 11 14:34:30 2023 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/ec.inc     Thu May 11 14:36:11 2023 +0000
@@ -1,4 +1,4 @@
 .PATH.S: ${.PARSEDIR}
-EC_SRCS += ecp_nistz256-armv8.S 
+EC_SRCS += ecp_nistz256-armv8.S
 ECNI = yes
 .include "../../ec.inc"
diff -r 9fb4e510a06c -r b0eb988b6ca1 crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/modes.inc
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/modes.inc  Thu May 11 14:34:30 2023 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/modes.inc  Thu May 11 14:36:11 2023 +0000
@@ -1,4 +1,3 @@
 .PATH.S: ${.PARSEDIR}
 MODES_SRCS += ghashv8-armx.S
-MODESCPPFLAGS = -DGHASH_ASM
 .include "../../modes.inc"
diff -r 9fb4e510a06c -r b0eb988b6ca1 crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/ec.inc
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/ec.inc      Thu May 11 14:34:30 2023 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/ec.inc      Thu May 11 14:36:11 2023 +0000
@@ -3,7 +3,7 @@ EC_SRCS += \
 ecp_nistz256-x86_64.S \
 x25519-x86_64.S 
 
-ECCPPFLAGS+= -DX25519_ASM
+ECCPPFLAGS+= -DX25519_ASM -DOPENSSL_NO_EC_NISTP_64_GCC_128
 
 ECNI = yes
 .include "../../ec.inc"
diff -r 9fb4e510a06c -r b0eb988b6ca1 crypto/external/bsd/openssl/lib/libcrypto/ec.inc
--- a/crypto/external/bsd/openssl/lib/libcrypto/ec.inc  Thu May 11 14:34:30 2023 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/ec.inc  Thu May 11 14:36:11 2023 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: ec.inc,v 1.8 2023/05/06 17:07:22 christos Exp $
+#      $NetBSD: ec.inc,v 1.9 2023/05/11 14:36:11 christos Exp $
 
 .PATH: ${OPENSSLSRC}/crypto/ec
 
@@ -37,7 +37,7 @@ ecx_meth.c \
 
 .if defined(ECNI)
 COPTS.ecp_nistz256.c+=-Wno-error=stack-protector
-EC_SRCS+= ecp_nistz256.c
+EC_SRCS+= ecp_nistz256.c ecp_nistp224.c ecp_nistp521.c ecp_nistputil.c
 .endif
 
 SRCS += ${EC_SRCS}