[src/netbsd-9]: src/crypto/external/bsd/openssl Pull up following revision(s)...

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

details:   https://anonhg.NetBSD.org/src/rev/8893face268c
branches:  netbsd-9
changeset: 954416:8893face268c
user:      martin <martin%NetBSD.org@localhost>
date:      Thu Apr 08 15:21:42 2021 +0000

description:
Pull up following revision(s) (requested by christos in ticket #1245):

        crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/modes.inc: file removal
        crypto/external/bsd/openssl/dist/crypto/modes/gcm128.c: revision 1.12

Disable again the assembly version of gcm_ghash_4bit for the 32 bit sparc
since it uses ldx/stx.

Do not pretend we have GHASH asm code

diffstat:

 crypto/external/bsd/openssl/dist/crypto/modes/gcm128.c         |  6 ++++--
 crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/modes.inc |  5 -----
 2 files changed, 4 insertions(+), 7 deletions(-)

diffs (30 lines):

diff -r 7bf271cf2176 -r 8893face268c crypto/external/bsd/openssl/dist/crypto/modes/gcm128.c
--- a/crypto/external/bsd/openssl/dist/crypto/modes/gcm128.c    Tue Apr 06 18:08:53 2021 +0000
+++ b/crypto/external/bsd/openssl/dist/crypto/modes/gcm128.c    Thu Apr 08 15:21:42 2021 +0000
@@ -689,13 +689,15 @@
 #  endif
 # elif defined(__sparc__) || defined(__sparc)
 #  include "sparc_arch.h"
-#  define GHASH_ASM_SPARC
-#  define GCM_FUNCREF_4BIT
+#  if defined(__arch64__)
+#   define GHASH_ASM_SPARC
+#   define GCM_FUNCREF_4BIT
 extern unsigned int OPENSSL_sparcv9cap_P[];
 void gcm_init_vis3(u128 Htable[16], const u64 Xi[2]);
 void gcm_gmult_vis3(u64 Xi[2], const u128 Htable[16]);
 void gcm_ghash_vis3(u64 Xi[2], const u128 Htable[16], const u8 *inp,
                     size_t len);
+#  endif /* __arch64__ */
 # elif defined(OPENSSL_CPUID_OBJ) && (defined(__powerpc__) || defined(__ppc__) || defined(_ARCH_PPC))
 #  include "ppc_arch.h"
 #  define GHASH_ASM_PPC
diff -r 7bf271cf2176 -r 8893face268c crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/modes.inc
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/modes.inc    Tue Apr 06 18:08:53 2021 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-.PATH.S: ${.PARSEDIR}
-MODES_SRCS = ghash-sparcv9.S
-MODESCPPFLAGS = -DGHASH_ASM
-AFLAGS.ghash-sparcv9.S+= -Wa,-Av9
-.include "../../modes.inc"