summaryrefslogtreecommitdiffstats
path: root/linux-arm/crypto/aes
diff options
context:
space:
mode:
Diffstat (limited to 'linux-arm/crypto/aes')
-rw-r--r--linux-arm/crypto/aes/aes-armv4.S4
-rw-r--r--linux-arm/crypto/aes/aesv8-armx.S (renamed from linux-arm/crypto/aes/aesv8-armx32.S)4
-rw-r--r--linux-arm/crypto/aes/bsaes-armv7.S4
3 files changed, 3 insertions, 9 deletions
diff --git a/linux-arm/crypto/aes/aes-armv4.S b/linux-arm/crypto/aes/aes-armv4.S
index c4d7065..1135020 100644
--- a/linux-arm/crypto/aes/aes-armv4.S
+++ b/linux-arm/crypto/aes/aes-armv4.S
@@ -1,4 +1,3 @@
-#if defined(__arm__)
@ ====================================================================
@ Written by Andy Polyakov <appro@openssl.org> for the OpenSSL
@@ -34,7 +33,7 @@
#if defined(__arm__)
#ifndef __KERNEL__
-# include <openssl/arm_arch.h>
+# include "arm_arch.h"
#else
# define __ARM_ARCH__ __LINUX_ARM_ARCH__
#endif
@@ -1197,4 +1196,3 @@ _armv4_AES_decrypt:
.align 2
#endif
-#endif \ No newline at end of file
diff --git a/linux-arm/crypto/aes/aesv8-armx32.S b/linux-arm/crypto/aes/aesv8-armx.S
index 6012b0c..006300c 100644
--- a/linux-arm/crypto/aes/aesv8-armx32.S
+++ b/linux-arm/crypto/aes/aesv8-armx.S
@@ -1,5 +1,4 @@
-#if defined(__arm__)
-#include <openssl/arm_arch.h>
+#include "arm_arch.h"
#if __ARM_MAX_ARCH__>=7
.text
@@ -753,4 +752,3 @@ aes_v8_ctr32_encrypt_blocks:
ldmia sp!,{r4,r5,r6,r7,r8,r9,r10,pc}
.size aes_v8_ctr32_encrypt_blocks,.-aes_v8_ctr32_encrypt_blocks
#endif
-#endif \ No newline at end of file
diff --git a/linux-arm/crypto/aes/bsaes-armv7.S b/linux-arm/crypto/aes/bsaes-armv7.S
index 85262d5..204ee3e 100644
--- a/linux-arm/crypto/aes/bsaes-armv7.S
+++ b/linux-arm/crypto/aes/bsaes-armv7.S
@@ -1,4 +1,3 @@
-#if defined(__arm__)
@ ====================================================================
@ Written by Andy Polyakov <appro@openssl.org> for the OpenSSL
@@ -49,7 +48,7 @@
#if defined(__arm__)
#ifndef __KERNEL__
-# include <openssl/arm_arch.h>
+# include "arm_arch.h"
# define VFP_ABI_PUSH vstmdb sp!,{d8-d15}
# define VFP_ABI_POP vldmia sp!,{d8-d15}
@@ -2576,4 +2575,3 @@ bsaes_xts_decrypt:
.size bsaes_xts_decrypt,.-bsaes_xts_decrypt
#endif
#endif
-#endif \ No newline at end of file