summaryrefslogtreecommitdiff
path: root/linux-x86_64/crypto/cipher_extra/aes128gcmsiv-x86_64.S
diff options
context:
space:
mode:
authorRobert Sloan <varomodt@google.com>2018-09-11 11:45:04 -0700
committerRobert Sloan <varomodt@google.com>2018-09-11 12:05:43 -0700
commit726e9d1f47fd5e4e4d8313670d0c719c52850afb (patch)
tree571d8a1a9056bd99aaa694a9167a123294912b11 /linux-x86_64/crypto/cipher_extra/aes128gcmsiv-x86_64.S
parent1f278ae75520bf67658f222a252fc94dec3c156f (diff)
downloadboringssl-726e9d1f47fd5e4e4d8313670d0c719c52850afb.tar.gz
external/boringssl: Sync to 689019fe40d5ad94df46ffeebcd794ff359a7074.
This includes the following changes: https://boringssl.googlesource.com/boringssl/+log/67e64342c1aa0b31b0b5c11e5ee21c481ce530e8..689019fe40d5ad94df46ffeebcd794ff359a7074 Test: BoringSSL CTS Presubmits Change-Id: Ib675c5478b0e45270e31248d1dadc5f4841da990
Diffstat (limited to 'linux-x86_64/crypto/cipher_extra/aes128gcmsiv-x86_64.S')
-rw-r--r--linux-x86_64/crypto/cipher_extra/aes128gcmsiv-x86_64.S9
1 files changed, 9 insertions, 0 deletions
diff --git a/linux-x86_64/crypto/cipher_extra/aes128gcmsiv-x86_64.S b/linux-x86_64/crypto/cipher_extra/aes128gcmsiv-x86_64.S
index 42e25f48..0d5b7ec6 100644
--- a/linux-x86_64/crypto/cipher_extra/aes128gcmsiv-x86_64.S
+++ b/linux-x86_64/crypto/cipher_extra/aes128gcmsiv-x86_64.S
@@ -1,4 +1,13 @@
+#if defined(__has_feature)
+#if __has_feature(memory_sanitizer) && !defined(OPENSSL_NO_ASM)
+#define OPENSSL_NO_ASM
+#endif
+#endif
+
#if defined(__x86_64__) && !defined(OPENSSL_NO_ASM)
+#if defined(BORINGSSL_PREFIX)
+#include <boringssl_prefix_symbols_asm.h>
+#endif
.data
.align 16