[src/trunk]: src/crypto/external/bsd/openssl/dist/crypto Make assembler modul...

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

details:   https://anonhg.NetBSD.org/src/rev/b0207e19c191
branches:  trunk
changeset: 348385:b0207e19c191
user:      joerg <joerg%NetBSD.org@localhost>
date:      Mon Oct 17 00:23:47 2016 +0000

description:
Make assembler modules optional for ARM architectures.

diffstat:

 crypto/external/bsd/openssl/dist/crypto/evp/e_aes.c    |  2 +-
 crypto/external/bsd/openssl/dist/crypto/modes/gcm128.c |  2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diffs (24 lines):

diff -r feded2d9e7c4 -r b0207e19c191 crypto/external/bsd/openssl/dist/crypto/evp/e_aes.c
--- a/crypto/external/bsd/openssl/dist/crypto/evp/e_aes.c       Sun Oct 16 23:07:31 2016 +0000
+++ b/crypto/external/bsd/openssl/dist/crypto/evp/e_aes.c       Mon Oct 17 00:23:47 2016 +0000
@@ -880,7 +880,7 @@
 { return &aes_##keylen##_##mode; }
 # endif
 
-# if defined(OPENSSL_CPUID_OBJ) && (defined(__arm__) || defined(__arm) || defined(__aarch64__))
+# if defined(OPENSSL_CPUID_OBJ) && (defined(__arm__) || defined(__arm) || defined(__aarch64__)) && defined(AES_ASM)
 #  include "arm_arch.h"
 #  if __ARM_MAX_ARCH__>=7
 #   if defined(BSAES_ASM)
diff -r feded2d9e7c4 -r b0207e19c191 crypto/external/bsd/openssl/dist/crypto/modes/gcm128.c
--- a/crypto/external/bsd/openssl/dist/crypto/modes/gcm128.c    Sun Oct 16 23:07:31 2016 +0000
+++ b/crypto/external/bsd/openssl/dist/crypto/modes/gcm128.c    Mon Oct 17 00:23:47 2016 +0000
@@ -722,7 +722,7 @@
 void gcm_ghash_4bit_x86(u64 Xi[2], const u128 Htable[16], const u8 *inp,
                         size_t len);
 #  endif
-# elif defined(__arm__) || defined(__arm) || defined(__aarch64__)
+# elif (defined(__arm__) || defined(__arm) || defined(__aarch64__)) && defined(GHASH_ASM)
 #  include "arm_arch.h"
 #  if __ARM_MAX_ARCH__>=7
 #   define GHASH_ASM_ARM