[src/trunk]: src/crypto/external/bsd/openssl/dist/crypto/modes fix v8 PMULL d...

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

details:   https://anonhg.NetBSD.org/src/rev/143d627a5d51
branches:  trunk
changeset: 321214:143d627a5d51
user:      christos <christos%NetBSD.org@localhost>
date:      Tue Mar 06 18:36:09 2018 +0000

description:
fix v8 PMULL detection (Robert Swindells)

diffstat:

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

diffs (25 lines):

diff -r e789dbd7cee4 -r 143d627a5d51 crypto/external/bsd/openssl/dist/crypto/modes/gcm128.c
--- a/crypto/external/bsd/openssl/dist/crypto/modes/gcm128.c    Tue Mar 06 18:32:37 2018 +0000
+++ b/crypto/external/bsd/openssl/dist/crypto/modes/gcm128.c    Tue Mar 06 18:36:09 2018 +0000
@@ -668,7 +668,6 @@
 #  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
@@ -676,10 +675,13 @@
 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"