From: bg <bg@b1d182e4-1ff8-0310-901f-bddb46175740>
Date: Thu, 14 May 2009 13:54:17 +0000 (+0000)
Subject: fixing two bugs in twister (asm)
X-Git-Url: https://git.cryptolib.org/?a=commitdiff_plain;h=bfbf5262c7ce1c1640ae57b3ad196b2eab3688f4;p=avr-crypto-lib.git

fixing two bugs in twister (asm)
---

diff --git a/twister-big-asm.S b/twister-big-asm.S
index e6e7691..a274cf4 100644
--- a/twister-big-asm.S
+++ b/twister-big-asm.S
@@ -405,10 +405,11 @@ twister_big_lastBlock:
 3:
 	tst r18
 	breq 4f
+31:
 	st Z+, r0
 	ld r0, X+
 	dec r18
-	
+	brne 31b
 4:	
 	mov r18, LEN_SAVE0
 	andi r18, 0x07
@@ -423,11 +424,13 @@ twister_big_lastBlock:
 
 5:
 	st Z+, r20	
+	tst r19
+	breq 7f
 6:	
 	st Z+, r1
 	dec r19
 	brne 6b
-	
+7:	
 	movw r24, CTX_SAVE0
 	movw r22, TMP_SAVE0
 	rcall twister_big_nextBlock
diff --git a/twister-small-asm.S b/twister-small-asm.S
index b5167ef..6cfda29 100644
--- a/twister-small-asm.S
+++ b/twister-small-asm.S
@@ -123,15 +123,15 @@ twister_small_lastBlock:
 	movw r30, TMP_SAVE0	
 	ldi r20, 0x80
 	sub r19, r18 /* r18: bytes to copy, r19: bytes to clear */
-	
+
 	ld r0, X+	
-3:
-	tst r18
+3:	tst r18
 	breq 4f
+31:
 	st Z+, r0
 	ld r0, X+
 	dec r18
-	
+	brne 31b
 4:	
 	mov r18, LEN_SAVE0
 	andi r18, 0x07
@@ -146,11 +146,14 @@ twister_small_lastBlock:
 
 5:
 	st Z+, r20	
+
+	tst r19
+	breq 7f
 6:	
 	st Z+, r1
 	dec r19
 	brne 6b
-	
+7:	
 	movw r24, CTX_SAVE0
 	movw r22, TMP_SAVE0
 	rcall twister_small_nextBlock