aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/src/crypto/zinc/chacha20
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2018-09-24 17:48:50 +0200
committerJason A. Donenfeld <Jason@zx2c4.com>2018-09-24 17:48:50 +0200
commit0c3c0bc324726aa328ecbbdd44ddcb000f9006f3 (patch)
treeb6d1090accc9d5860e459d0a7a901f4c1590e58f /src/crypto/zinc/chacha20
parentchacha20-arm: updated scalar code from Andy (diff)
downloadwireguard-monolithic-historical-0c3c0bc324726aa328ecbbdd44ddcb000f9006f3.tar.xz
wireguard-monolithic-historical-0c3c0bc324726aa328ecbbdd44ddcb000f9006f3.zip
chacha20-arm: remove unused preambles
Diffstat (limited to 'src/crypto/zinc/chacha20')
-rw-r--r--src/crypto/zinc/chacha20/chacha20-arm.S27
-rw-r--r--src/crypto/zinc/chacha20/chacha20-arm64.S4
2 files changed, 1 insertions, 30 deletions
diff --git a/src/crypto/zinc/chacha20/chacha20-arm.S b/src/crypto/zinc/chacha20/chacha20-arm.S
index 3394f4a..7fbb631 100644
--- a/src/crypto/zinc/chacha20/chacha20-arm.S
+++ b/src/crypto/zinc/chacha20/chacha20-arm.S
@@ -486,31 +486,6 @@ ENDPROC(hchacha20_arm)
#define ldrhsb ldrbhs
#endif
-.align 5
-.Lsigma:
-.long 0x61707865,0x3320646e,0x79622d32,0x6b206574 @ endian-neutral
-.Lone:
-.long 1,0,0,0
-.word -1
-
-.align 5
-.Lshort:
- ldmia r12,{r4-r7} @ load counter and nonce
- sub sp,sp,#4*(16) @ off-load area
-#if __LINUX_ARM_ARCH__ < 7 && !defined(__thumb2__)
- sub r14,pc,#100 @ .Lsigma
-#else
- adr r14,.Lsigma @ .Lsigma
-#endif
- stmdb sp!,{r4-r7} @ copy counter and nonce
- ldmia r3,{r4-r11} @ load key
- ldmia r14,{r0-r3} @ load sigma
- stmdb sp!,{r4-r11} @ copy key
- stmdb sp!,{r0-r3} @ copy sigma
- str r10,[sp,#4*(16+10)] @ off-load "rx"
- str r11,[sp,#4*(16+11)] @ off-load "rx"
- b .Loop_outer_enter
-
.align 4
.Loop_outer:
ldmia sp,{r0-r9} @ load key material
@@ -1226,8 +1201,6 @@ ENTRY(chacha20_neon)
#endif
addeq sp,sp,#4*3
beq .Lno_data_neon
- cmp r2,#192 @ test len
- bls .Lshort
.Lchacha20_neon_begin:
adr r14,.Lsigma2
vstmdb sp!,{d8-d15} @ ABI spec says so
diff --git a/src/crypto/zinc/chacha20/chacha20-arm64.S b/src/crypto/zinc/chacha20/chacha20-arm64.S
index 1aeadab..5037510 100644
--- a/src/crypto/zinc/chacha20/chacha20-arm64.S
+++ b/src/crypto/zinc/chacha20/chacha20-arm64.S
@@ -18,7 +18,7 @@
.align 5
ENTRY(chacha20_arm)
cbz x2,.Labort
-.Lshort:
+
stp x29,x30,[sp,#-96]!
add x29,sp,#0
@@ -293,8 +293,6 @@ ENDPROC(chacha20_arm)
.align 5
ENTRY(chacha20_neon)
cbz x2,.Labort_neon
- cmp x2,#192
- b.lo .Lshort
stp x29,x30,[sp,#-96]!
add x29,sp,#0