bg
/
avr-crypto-lib
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

progress in asm version of keccak

This commit is contained in:
bg 2012-12-18 12:05:10 +01:00
parent 6a1c5e57c5
commit d8ce985621
2 changed files with 90 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
keccak/keccak-asm.S
View File

@ -37,18 +37,45 @@
} }
*/ */
theta_2a:
/*
input:
r24:r25 = a ; uint64_t a[5][5]
X = b ; uint64_t *b
output:
a[0..4][0] ^= b
r20 = 0
r21 = XX
r22 = XX
r24:r25 += 8
X += 8
Z = r24:r25 + 7 + 4 * 40
*/
ldi r20, 8
10:
movw ZL, r24
ld r21, X+
.irp r, 0, 1, 2, 3, 4
ld r22, Z
eor r22, r21
st Z, r22
.if \r != 4
adiw ZL, 40
.endif
.endr
adiw r24, 1
dec r20
brne 10b
ret
.global keccak_theta .global keccak_theta
keccak_theta: keccak_theta:
movw r30, r24 movw r30, r24 ; Z = a
movw r26, r22 movw r26, r22 ; X = b
; .irp offset, 0, 1, 2, 3, 4
ldi r19, 5 ldi r19, 5
10: 10:
ldi r20, 8 ldi r20, 8
20: 20:
ld r22, Z ld r22, Z
adiw ZL, 40 adiw ZL, 40
ld r21, Z ld r21, Z
@ -62,10 +89,8 @@ keccak_theta:
adiw ZL, 40 adiw ZL, 40
ld r21, Z ld r21, Z
eor r22, r21 eor r22, r21
adiw r24, 1 adiw r24, 1
movw r30, r24 movw r30, r24
st X+, r22 st X+, r22
dec r20 dec r20
brne 20b brne 20b
@ -73,6 +98,56 @@ keccak_theta:
adiw XL, 8 * 4 adiw XL, 8 * 4
dec r19 dec r19
brne 10b brne 10b
; .endr /*
for(i = 0; i < 5; ++i){
for(j = 0; j < 5; ++j){
a[j][i] ^= b[(4 + i) % 5][0];
}
}
for(i = 0; i < 5; ++i){
for(j = 0; j < 5; ++j){
a[j][i] ^= rotate64_1bit_left(b[(i + 1) % 5][0]);
}
}
*/
sbiw XL, 5 * 8
sbiw r24, 40
/* a[0..4][0]{0..7} ^= b[4][0]{0..7} */
rcall theta_2a
/* a[0..4][1]{0..7} ^= b[0][0]{0..7} */
subi XL, lo8(4 * 5 * 8 + 8)
sbci XH, hi8(4 * 5 * 8 + 8)
rcall theta_2a
/* a[0..4][2]{0..7} ^= b[1][0]{0..7} */
adiw XL, 4 * 8
rcall theta_2a
/* a[0..4][3]{0..7} ^= b[2][0]{0..7} */
adiw XL, 4 * 8
rcall theta_2a
/* a[0..4][4]{0..7} ^= b[3][0]{0..7} */
adiw XL, 4 * 8
rcall theta_2a
ret
ldi r20, 8
10:
movw ZL, r24
ld r21, X+
.irp r, 0, 1, 2, 3, 4
ld r22, Z
eor r22, r21
st Z, r22
.if \r != 4
adiw ZL, 40
.endif
.endr
adiw r24, 1
dec r20
brne 10b
ret ret

13
keccak/keccak-stub.c
View File

@ -30,7 +30,7 @@
# undef DEBUG # undef DEBUG
#endif #endif
#define DEBUG 0 #define DEBUG 1
#if DEBUG #if DEBUG
#include "cli.h" #include "cli.h"
@ -107,7 +107,7 @@ void keccak_round(uint64_t a[5][5], uint8_t rci){
uint8_t v8[8]; uint8_t v8[8];
} t; } t;
/* theta */ /* theta */
#if DEBUG #if DEBUG & 0
printf_P(PSTR("\npre-theta(1):")); printf_P(PSTR("\npre-theta(1):"));
keccak_dump_state(b); keccak_dump_state(b);
#endif #endif
@ -117,11 +117,10 @@ void keccak_round(uint64_t a[5][5], uint8_t rci){
keccak_dump_state(b); keccak_dump_state(b);
#endif #endif
for(i = 0; i < 5; ++i){ for(i = 0; i < 5; ++i){
t.v64 = b[(4 + i) % 5][0] ^ rotate64_1bit_left(b[(i + 1) % 5][0]); for(j = 0; j < 5; ++j){
for(j = 0; j < 5; ++j){ a[j][i] ^= rotate64_1bit_left(b[(i + 1) % 5][0]);
a[j][i] ^= t.v64; }
} }
}
#if DEBUG #if DEBUG
cli_putstr_P(PSTR("\r\nAfter theta:")); cli_putstr_P(PSTR("\r\nAfter theta:"));
keccak_dump_state(a); keccak_dump_state(a);