Module Name: src
Committed By: martin
Date: Thu Apr 8 15:21:42 UTC 2021
Modified Files:
src/crypto/external/bsd/openssl/dist/crypto/modes [netbsd-9]: gcm128.c
Removed Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc [netbsd-9]:
modes.inc
Log Message:
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
To generate a diff of this commit:
cvs rdiff -u -r1.6.2.2 -r1.6.2.3 \
src/crypto/external/bsd/openssl/dist/crypto/modes/gcm128.c
cvs rdiff -u -r1.3.16.1 -r0 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/modes.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/dist/crypto/modes/gcm128.c
diff -u src/crypto/external/bsd/openssl/dist/crypto/modes/gcm128.c:1.6.2.2 src/crypto/external/bsd/openssl/dist/crypto/modes/gcm128.c:1.6.2.3
--- src/crypto/external/bsd/openssl/dist/crypto/modes/gcm128.c:1.6.2.2 Sat Mar 27 14:35:09 2021
+++ src/crypto/external/bsd/openssl/dist/crypto/modes/gcm128.c Thu Apr 8 15:21:42 2021
@@ -689,13 +689,15 @@ void gcm_ghash_v8(u64 Xi[2], const u128
# 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
