Module Name: src
Committed By: christos
Date: Thu May 11 14:36:12 UTC 2023
Modified Files:
src/crypto/external/bsd/openssl/include/openssl: configuration.h
src/crypto/external/bsd/openssl/lib/libcrypto: ec.inc
src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64: ec.inc
modes.inc
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64: ec.inc
Log Message:
changes to get aarch64 to link
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/include/openssl/configuration.h
cvs rdiff -u -r1.8 -r1.9 src/crypto/external/bsd/openssl/lib/libcrypto/ec.inc
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/ec.inc
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/modes.inc
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/ec.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/include/openssl/configuration.h
diff -u src/crypto/external/bsd/openssl/include/openssl/configuration.h:1.2 src/crypto/external/bsd/openssl/include/openssl/configuration.h:1.3
--- src/crypto/external/bsd/openssl/include/openssl/configuration.h:1.2 Tue May 9 12:41:29 2023
+++ src/crypto/external/bsd/openssl/include/openssl/configuration.h Thu May 11 10:36:11 2023
@@ -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
Index: src/crypto/external/bsd/openssl/lib/libcrypto/ec.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/ec.inc:1.8 src/crypto/external/bsd/openssl/lib/libcrypto/ec.inc:1.9
--- src/crypto/external/bsd/openssl/lib/libcrypto/ec.inc:1.8 Sat May 6 13:07:22 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/ec.inc Thu May 11 10:36:11 2023
@@ -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}
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.1 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.1 Wed Mar 7 11:05:44 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/ec.inc Thu May 11 10:36:11 2023
@@ -1,4 +1,4 @@
.PATH.S: ${.PARSEDIR}
-EC_SRCS += ecp_nistz256-armv8.S
+EC_SRCS += ecp_nistz256-armv8.S
ECNI = yes
.include "../../ec.inc"
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/modes.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/modes.inc:1.3 src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/modes.inc:1.4
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/modes.inc:1.3 Wed May 10 21:31:54 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/modes.inc Thu May 11 10:36:11 2023
@@ -1,4 +1,3 @@
.PATH.S: ${.PARSEDIR}
MODES_SRCS += ghashv8-armx.S
-MODESCPPFLAGS = -DGHASH_ASM
.include "../../modes.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.2 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.2 Sun Sep 23 09:33:05 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/ec.inc Thu May 11 10:36:12 2023
@@ -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"
