summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNiels Möller <nisse@lysator.liu.se>2015-04-29 20:54:37 +0200
committerNiels Möller <nisse@lysator.liu.se>2015-04-29 20:54:37 +0200
commitfce23774c8071761c44b2bd633bb37b2678c21e1 (patch)
treed25b1b2cd4912a7d56e1e55694c48226e9477272
parenta434246bcb3b70df9ba2f44d5d9d05caac6a02cf (diff)
downloadnettle-fce23774c8071761c44b2bd633bb37b2678c21e1.tar.gz
Fix syntax error in ARM offset addressing. Spotted by Jukka Ukkonen.
-rw-r--r--ChangeLog2
-rw-r--r--arm/v6/sha256-compress.asm4
2 files changed, 4 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index a2844e92..bb86bf0d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2015-04-29 Niels Möller <nisse@lysator.liu.se>
+ * arm/v6/sha256-compress.asm: Fix syntax error in offset
+ addressing. Spotted by Jukka Ukkonen.
* arm/v6/aes-decrypt-internal.asm: Drop %-prefix on r12 register.
* arm/v6/aes-encrypt-internal.asm: Likewise.
diff --git a/arm/v6/sha256-compress.asm b/arm/v6/sha256-compress.asm
index 75607789..e6f4e1e9 100644
--- a/arm/v6/sha256-compress.asm
+++ b/arm/v6/sha256-compress.asm
@@ -126,7 +126,7 @@ define(<NOEXPN>, <
PROLOGUE(_nettle_sha256_compress)
push {r4,r5,r6,r7,r8,r10,r11,r14}
sub sp, sp, #68
- str STATE, [sp, +#64]
+ str STATE, [sp, #+64]
C Load data up front, since we don't have enough registers
C to load and shift on-the-fly
@@ -199,7 +199,7 @@ PROLOGUE(_nettle_sha256_compress)
EXPN(15) ROUND(SB,SC,SD,SE,SF,SG,SH,SA)
bne .Loop2
- ldr STATE, [sp, +#64]
+ ldr STATE, [sp, #+64]
C No longer needed registers
ldm STATE, {r1,r2,r12,r14}
add SA, SA, r1