diff options
| author | Adam Langley <agl@google.com> | 2015-08-25 04:03:17 +0300 |
|---|---|---|
| committer | Adam Langley <agl@google.com> | 2015-08-26 04:57:59 +0300 |
| commit | 73415b6aa0ebe5a6b8acc0bcd66483eca1481676 (patch) | |
| tree | 2308a0e0d99069a42b64f96dcba374f17affd1df /crypto/modes | |
| parent | 61821bf149f774e7110ab3a76cc5e1e32fa5c2c7 (diff) | |
Move arm_arch.h and fix up lots of include paths.
arm_arch.h is included from ARM asm files, but lives in crypto/, not
openssl/include/. Since the asm files are often built from a different
location than their position in the source tree, relative include paths
are unlikely to work so, rather than having crypto/ be a de-facto,
second global include path, this change moves arm_arch.h to
include/openssl/.
It also removes entries from many include paths because they should be
needed as relative includes are always based on the locations of the
source file.
Change-Id: I638ff43d641ca043a4fc06c0d901b11c6ff73542
Reviewed-on: https://boringssl-review.googlesource.com/5746
Reviewed-by: Adam Langley <agl@google.com>
Diffstat (limited to 'crypto/modes')
| -rw-r--r-- | crypto/modes/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | crypto/modes/asm/ghash-armv4.pl | 2 | ||||
| -rw-r--r-- | crypto/modes/asm/ghashv8-armx.pl | 2 | ||||
| -rw-r--r-- | crypto/modes/gcm.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/crypto/modes/CMakeLists.txt b/crypto/modes/CMakeLists.txt index ffb29b62..6da5207e 100644 --- a/crypto/modes/CMakeLists.txt +++ b/crypto/modes/CMakeLists.txt @@ -1,4 +1,4 @@ -include_directories(. .. ../../include) +include_directories(../../include) if (${ARCH} STREQUAL "x86_64") set( diff --git a/crypto/modes/asm/ghash-armv4.pl b/crypto/modes/asm/ghash-armv4.pl index a0d04cec..dc5b99e8 100644 --- a/crypto/modes/asm/ghash-armv4.pl +++ b/crypto/modes/asm/ghash-armv4.pl @@ -134,7 +134,7 @@ ___ $code=<<___; #if defined(__arm__) -#include "arm_arch.h" +#include <openssl/arm_arch.h> .syntax unified diff --git a/crypto/modes/asm/ghashv8-armx.pl b/crypto/modes/asm/ghashv8-armx.pl index 5856c94a..3a7b8d8b 100644 --- a/crypto/modes/asm/ghashv8-armx.pl +++ b/crypto/modes/asm/ghashv8-armx.pl @@ -54,7 +54,7 @@ my ($Xl,$Xm,$Xh,$IN)=map("q$_",(0..3)); my ($t0,$t1,$t2,$xC2,$H,$Hhl,$H2)=map("q$_",(8..14)); $code=<<___; -#include "arm_arch.h" +#include <openssl/arm_arch.h> .text ___ diff --git a/crypto/modes/gcm.c b/crypto/modes/gcm.c index e7aa46e4..593dce88 100644 --- a/crypto/modes/gcm.c +++ b/crypto/modes/gcm.c @@ -349,7 +349,7 @@ void gcm_ghash_4bit_x86(uint64_t Xi[2], const u128 Htable[16], const uint8_t *in size_t len); #endif #elif defined(OPENSSL_ARM) || defined(OPENSSL_AARCH64) -#include "../arm_arch.h" +#include <openssl/arm_arch.h> #if __ARM_ARCH__ >= 7 #define GHASH_ASM_ARM #define GCM_FUNCREF_4BIT |