Module Name: src
Committed By: joerg
Date: Mon Oct 17 00:23:47 UTC 2016
Modified Files:
src/crypto/external/bsd/openssl/dist/crypto/evp: e_aes.c
src/crypto/external/bsd/openssl/dist/crypto/modes: gcm128.c
Log Message:
Make assembler modules optional for ARM architectures.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
src/crypto/external/bsd/openssl/dist/crypto/evp/e_aes.c
cvs rdiff -u -r1.2 -r1.3 \
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/evp/e_aes.c
diff -u src/crypto/external/bsd/openssl/dist/crypto/evp/e_aes.c:1.9 src/crypto/external/bsd/openssl/dist/crypto/evp/e_aes.c:1.10
--- src/crypto/external/bsd/openssl/dist/crypto/evp/e_aes.c:1.9 Fri Oct 14 16:23:19 2016
+++ src/crypto/external/bsd/openssl/dist/crypto/evp/e_aes.c Mon Oct 17 00:23:47 2016
@@ -880,7 +880,7 @@ const EVP_CIPHER *EVP_aes_##keylen##_##m
{ 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)
Index: src/crypto/external/bsd/openssl/dist/crypto/modes/gcm128.c
diff -u src/crypto/external/bsd/openssl/dist/crypto/modes/gcm128.c:1.2 src/crypto/external/bsd/openssl/dist/crypto/modes/gcm128.c:1.3
--- src/crypto/external/bsd/openssl/dist/crypto/modes/gcm128.c:1.2 Fri Oct 14 16:23:19 2016
+++ src/crypto/external/bsd/openssl/dist/crypto/modes/gcm128.c Mon Oct 17 00:23:47 2016
@@ -722,7 +722,7 @@ void gcm_gmult_4bit_x86(u64 Xi[2], const
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
