summaryrefslogtreecommitdiff
path: root/crypto
diff options
context:
space:
mode:
authormartin <martin@NetBSD.org>2021-04-08 15:21:42 +0000
committermartin <martin@NetBSD.org>2021-04-08 15:21:42 +0000
commit00d85f71d4b0935e6225176711a4e1f8a5020ef3 (patch)
tree05212a7021169b99f1854f7fda8d6bd0a3f4f379 /crypto
parentf562499249545840fe428aed316241214b04a380 (diff)
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 (limited to 'crypto')
-rw-r--r--crypto/external/bsd/openssl/dist/crypto/modes/gcm128.c6
-rw-r--r--crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/modes.inc5
2 files changed, 4 insertions, 7 deletions
diff --git a/crypto/external/bsd/openssl/dist/crypto/modes/gcm128.c b/crypto/external/bsd/openssl/dist/crypto/modes/gcm128.c
index 26a9cb36bee..6214b21e227 100644
--- a/crypto/external/bsd/openssl/dist/crypto/modes/gcm128.c
+++ b/crypto/external/bsd/openssl/dist/crypto/modes/gcm128.c
@@ -689,13 +689,15 @@ void gcm_ghash_v8(u64 Xi[2], const u128 Htable[16], const u8 *inp,
# 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 --git a/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/modes.inc b/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/modes.inc
deleted file mode 100644
index 6975427ee93..00000000000
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/modes.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-.PATH.S: ${.PARSEDIR}
-MODES_SRCS = ghash-sparcv9.S
-MODESCPPFLAGS = -DGHASH_ASM
-AFLAGS.ghash-sparcv9.S+= -Wa,-Av9
-.include "../../modes.inc"