[src/trunk]: src/crypto/external/bsd/openssl/dist/crypto/modes reduce diff wi...

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

details:   https://anonhg.NetBSD.org/src/rev/25f8af59530a
branches:  trunk
changeset: 935037:25f8af59530a
user:      christos <christos%NetBSD.org@localhost>
date:      Mon Jun 22 19:55:43 2020 +0000

description:
reduce diff with upstream. we always compile with v8 assembly and
detect at runtime.

diffstat:

 crypto/external/bsd/openssl/dist/crypto/modes/gcm128.c |  8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diffs (32 lines):

diff -r b653b2a0bf13 -r 25f8af59530a crypto/external/bsd/openssl/dist/crypto/modes/gcm128.c
--- a/crypto/external/bsd/openssl/dist/crypto/modes/gcm128.c    Mon Jun 22 17:38:27 2020 +0000
+++ b/crypto/external/bsd/openssl/dist/crypto/modes/gcm128.c    Mon Jun 22 19:55:43 2020 +0000
@@ -668,6 +668,7 @@
 #  if __ARM_MAX_ARCH__>=7
 #   define GHASH_ASM_ARM
 #   define GCM_FUNCREF_4BIT
+#   define PMULL_CAPABLE        (OPENSSL_armcap_P & ARMV8_PMULL)
 #   if defined(__arm__) || defined(__arm)
 #    define NEON_CAPABLE        (OPENSSL_armcap_P & ARMV7_NEON)
 #   endif
@@ -675,18 +676,15 @@
 void gcm_gmult_neon(u64 Xi[2], const u128 Htable[16]);
 void gcm_ghash_neon(u64 Xi[2], const u128 Htable[16], const u8 *inp,
                     size_t len);
-#   if __ARM_MAX_ARCH__>=8
-#    define PMULL_CAPABLE        (OPENSSL_armcap_P & ARMV8_PMULL)
 void gcm_init_v8(u128 Htable[16], const u64 Xi[2]);
 void gcm_gmult_v8(u64 Xi[2], const u128 Htable[16]);
 void gcm_ghash_v8(u64 Xi[2], const u128 Htable[16], const u8 *inp,
                   size_t len);
-#   endif
 #  endif
 # elif defined(__sparc__) || defined(__sparc)
 #  include "sparc_arch.h"
-#   define GHASH_ASM_SPARC
-#   define GCM_FUNCREF_4BIT
+#  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]);