Module Name:    src
Committed By:   christos
Date:           Thu Apr  8 12:31:49 UTC 2021

Modified Files:
        src/crypto/external/bsd/openssl/dist/crypto/modes: gcm128.c

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


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
    src/crypto/external/bsd/openssl/dist/crypto/modes/gcm128.c

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.11 src/crypto/external/bsd/openssl/dist/crypto/modes/gcm128.c:1.12
--- src/crypto/external/bsd/openssl/dist/crypto/modes/gcm128.c:1.11	Thu Mar 25 14:51:19 2021
+++ src/crypto/external/bsd/openssl/dist/crypto/modes/gcm128.c	Thu Apr  8 08:31:49 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

Reply via email to