diff options
Diffstat (limited to 'ios-aarch64/crypto/fipsmodule')
-rw-r--r-- | ios-aarch64/crypto/fipsmodule/aesv8-armx64.S | 9 | ||||
-rw-r--r-- | ios-aarch64/crypto/fipsmodule/armv8-mont.S | 3 | ||||
-rw-r--r-- | ios-aarch64/crypto/fipsmodule/ghashv8-armx64.S | 3 | ||||
-rw-r--r-- | ios-aarch64/crypto/fipsmodule/sha1-armv8.S | 22 | ||||
-rw-r--r-- | ios-aarch64/crypto/fipsmodule/sha256-armv8.S | 29 | ||||
-rw-r--r-- | ios-aarch64/crypto/fipsmodule/sha512-armv8.S | 16 |
6 files changed, 39 insertions, 43 deletions
diff --git a/ios-aarch64/crypto/fipsmodule/aesv8-armx64.S b/ios-aarch64/crypto/fipsmodule/aesv8-armx64.S index fe4742f1..78e03795 100644 --- a/ios-aarch64/crypto/fipsmodule/aesv8-armx64.S +++ b/ios-aarch64/crypto/fipsmodule/aesv8-armx64.S @@ -1,3 +1,6 @@ +// This file is generated from a similarly-named Perl script in the BoringSSL +// source tree. Do not edit by hand. + #if defined(__has_feature) #if __has_feature(memory_sanitizer) && !defined(OPENSSL_NO_ASM) #define OPENSSL_NO_ASM @@ -13,12 +16,15 @@ #if __ARM_MAX_ARCH__>=7 .text +.section __TEXT,__const .align 5 Lrcon: .long 0x01,0x01,0x01,0x01 .long 0x0c0f0e0d,0x0c0f0e0d,0x0c0f0e0d,0x0c0f0e0d // rotate-n-splat .long 0x1b,0x1b,0x1b,0x1b +.text + .globl _aes_hw_set_encrypt_key .private_extern _aes_hw_set_encrypt_key @@ -40,7 +46,8 @@ Lenc_key: tst w1,#0x3f b.ne Lenc_key_abort - adr x3,Lrcon + adrp x3,Lrcon@PAGE + add x3,x3,Lrcon@PAGEOFF cmp w1,#192 eor v0.16b,v0.16b,v0.16b diff --git a/ios-aarch64/crypto/fipsmodule/armv8-mont.S b/ios-aarch64/crypto/fipsmodule/armv8-mont.S index d2285921..6f11fd7e 100644 --- a/ios-aarch64/crypto/fipsmodule/armv8-mont.S +++ b/ios-aarch64/crypto/fipsmodule/armv8-mont.S @@ -1,3 +1,6 @@ +// This file is generated from a similarly-named Perl script in the BoringSSL +// source tree. Do not edit by hand. + #if defined(__has_feature) #if __has_feature(memory_sanitizer) && !defined(OPENSSL_NO_ASM) #define OPENSSL_NO_ASM diff --git a/ios-aarch64/crypto/fipsmodule/ghashv8-armx64.S b/ios-aarch64/crypto/fipsmodule/ghashv8-armx64.S index 79a1df53..b0af99d6 100644 --- a/ios-aarch64/crypto/fipsmodule/ghashv8-armx64.S +++ b/ios-aarch64/crypto/fipsmodule/ghashv8-armx64.S @@ -1,3 +1,6 @@ +// This file is generated from a similarly-named Perl script in the BoringSSL +// source tree. Do not edit by hand. + #if defined(__has_feature) #if __has_feature(memory_sanitizer) && !defined(OPENSSL_NO_ASM) #define OPENSSL_NO_ASM diff --git a/ios-aarch64/crypto/fipsmodule/sha1-armv8.S b/ios-aarch64/crypto/fipsmodule/sha1-armv8.S index 17e1a569..0b919169 100644 --- a/ios-aarch64/crypto/fipsmodule/sha1-armv8.S +++ b/ios-aarch64/crypto/fipsmodule/sha1-armv8.S @@ -1,3 +1,6 @@ +// This file is generated from a similarly-named Perl script in the BoringSSL +// source tree. Do not edit by hand. + #if defined(__has_feature) #if __has_feature(memory_sanitizer) && !defined(OPENSSL_NO_ASM) #define OPENSSL_NO_ASM @@ -18,13 +21,8 @@ .align 6 _sha1_block_data_order: -#ifdef __ILP32__ - ldrsw x16,LOPENSSL_armcap_P -#else - ldr x16,LOPENSSL_armcap_P -#endif - adr x17,LOPENSSL_armcap_P - add x16,x16,x17 + adrp x16,_OPENSSL_armcap_P@PAGE + add x16,x16,_OPENSSL_armcap_P@PAGEOFF ldr w16,[x16] tst w16,#ARMV8_SHA1 b.ne Lv8_entry @@ -1091,7 +1089,8 @@ Lv8_entry: stp x29,x30,[sp,#-16]! add x29,sp,#0 - adr x4,Lconst + adrp x4,Lconst@PAGE + add x4,x4,Lconst@PAGEOFF eor v1.16b,v1.16b,v1.16b ld1 {v0.4s},[x0],#16 ld1 {v1.s}[0],[x0] @@ -1214,18 +1213,13 @@ Loop_hw: ldr x29,[sp],#16 ret +.section __TEXT,__const .align 6 Lconst: .long 0x5a827999,0x5a827999,0x5a827999,0x5a827999 //K_00_19 .long 0x6ed9eba1,0x6ed9eba1,0x6ed9eba1,0x6ed9eba1 //K_20_39 .long 0x8f1bbcdc,0x8f1bbcdc,0x8f1bbcdc,0x8f1bbcdc //K_40_59 .long 0xca62c1d6,0xca62c1d6,0xca62c1d6,0xca62c1d6 //K_60_79 -LOPENSSL_armcap_P: -#ifdef __ILP32__ -.long _OPENSSL_armcap_P-. -#else -.quad _OPENSSL_armcap_P-. -#endif .byte 83,72,65,49,32,98,108,111,99,107,32,116,114,97,110,115,102,111,114,109,32,102,111,114,32,65,82,77,118,56,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0 .align 2 .align 2 diff --git a/ios-aarch64/crypto/fipsmodule/sha256-armv8.S b/ios-aarch64/crypto/fipsmodule/sha256-armv8.S index 9076eeb0..617afc94 100644 --- a/ios-aarch64/crypto/fipsmodule/sha256-armv8.S +++ b/ios-aarch64/crypto/fipsmodule/sha256-armv8.S @@ -1,3 +1,6 @@ +// This file is generated from a similarly-named Perl script in the BoringSSL +// source tree. Do not edit by hand. + #if defined(__has_feature) #if __has_feature(memory_sanitizer) && !defined(OPENSSL_NO_ASM) #define OPENSSL_NO_ASM @@ -60,13 +63,8 @@ .align 6 _sha256_block_data_order: #ifndef __KERNEL__ -# ifdef __ILP32__ - ldrsw x16,LOPENSSL_armcap_P -# else - ldr x16,LOPENSSL_armcap_P -# endif - adr x17,LOPENSSL_armcap_P - add x16,x16,x17 + adrp x16,_OPENSSL_armcap_P@PAGE + add x16,x16,_OPENSSL_armcap_P@PAGEOFF ldr w16,[x16] tst w16,#ARMV8_SHA256 b.ne Lv8_entry @@ -86,7 +84,8 @@ _sha256_block_data_order: ldp w24,w25,[x0,#4*4] add x2,x1,x2,lsl#6 // end of input ldp w26,w27,[x0,#6*4] - adr x30,LK256 + adrp x30,LK256@PAGE + add x30,x30,LK256@PAGEOFF stp x0,x2,[x29,#96] Loop: @@ -1033,6 +1032,7 @@ Loop_16_xx: ret +.section __TEXT,__const .align 6 LK256: @@ -1054,18 +1054,10 @@ LK256: .long 0x90befffa,0xa4506ceb,0xbef9a3f7,0xc67178f2 .long 0 //terminator -#ifndef __KERNEL__ -.align 3 -LOPENSSL_armcap_P: -# ifdef __ILP32__ -.long _OPENSSL_armcap_P-. -# else -.quad _OPENSSL_armcap_P-. -# endif -#endif .byte 83,72,65,50,53,54,32,98,108,111,99,107,32,116,114,97,110,115,102,111,114,109,32,102,111,114,32,65,82,77,118,56,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0 .align 2 .align 2 +.text #ifndef __KERNEL__ .align 6 @@ -1075,7 +1067,8 @@ Lv8_entry: add x29,sp,#0 ld1 {v0.4s,v1.4s},[x0] - adr x3,LK256 + adrp x3,LK256@PAGE + add x3,x3,LK256@PAGEOFF Loop_hw: ld1 {v4.16b,v5.16b,v6.16b,v7.16b},[x1],#64 diff --git a/ios-aarch64/crypto/fipsmodule/sha512-armv8.S b/ios-aarch64/crypto/fipsmodule/sha512-armv8.S index d4fd3175..a2a92d7b 100644 --- a/ios-aarch64/crypto/fipsmodule/sha512-armv8.S +++ b/ios-aarch64/crypto/fipsmodule/sha512-armv8.S @@ -1,3 +1,6 @@ +// This file is generated from a similarly-named Perl script in the BoringSSL +// source tree. Do not edit by hand. + #if defined(__has_feature) #if __has_feature(memory_sanitizer) && !defined(OPENSSL_NO_ASM) #define OPENSSL_NO_ASM @@ -74,7 +77,8 @@ _sha512_block_data_order: ldp x24,x25,[x0,#4*8] add x2,x1,x2,lsl#7 // end of input ldp x26,x27,[x0,#6*8] - adr x30,LK512 + adrp x30,LK512@PAGE + add x30,x30,LK512@PAGEOFF stp x0,x2,[x29,#96] Loop: @@ -1021,6 +1025,7 @@ Loop_16_xx: ret +.section __TEXT,__const .align 6 LK512: @@ -1066,15 +1071,6 @@ LK512: .quad 0x5fcb6fab3ad6faec,0x6c44198c4a475817 .quad 0 // terminator -#ifndef __KERNEL__ -.align 3 -LOPENSSL_armcap_P: -# ifdef __ILP32__ -.long _OPENSSL_armcap_P-. -# else -.quad _OPENSSL_armcap_P-. -# endif -#endif .byte 83,72,65,53,49,50,32,98,108,111,99,107,32,116,114,97,110,115,102,111,114,109,32,102,111,114,32,65,82,77,118,56,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0 .align 2 .align 2 |