[keccak-asm] *_init in asm

[avr-crypto-lib.git] / keccak / keccak-asm.S

diff --git a/keccak/keccak-asm.S b/keccak/keccak-asm.S
index 7b7c6cf3144bb4374831c4cb5dbb1ecb9f66d420..393535b1407c1dcb83db25942ccf6778fcab99d4 100644 (file)
--- a/keccak/keccak-asm.S
+++ b/keccak/keccak-asm.S
@@ -622,6 +622,42 @@ icall_r16_times:
        ret
        .endfunc
 
+
+       .global keccak224_ctx2hash
+       .func keccak224_ctx2hash
+keccak224_ctx2hash:
+       movw r20, r22
+       ldi r22, lo8(224)
+       ldi r23, hi8(224)
+       rjmp keccak_ctx2hash
+       .endfunc
+
+       .global keccak384_ctx2hash
+       .func keccak384_ctx2hash
+keccak384_ctx2hash:
+       movw r20, r22
+       ldi r22, lo8(384)
+       ldi r23, hi8(384)
+       rjmp keccak_ctx2hash
+       .endfunc
+
+       .global keccak512_ctx2hash
+       .func keccak512_ctx2hash
+keccak512_ctx2hash:
+       movw r20, r22
+       ldi r22, lo8(512)
+       ldi r23, hi8(512)
+       rjmp keccak_ctx2hash
+       .endfunc
+
+       .global keccak256_ctx2hash
+       .func keccak256_ctx2hash
+keccak256_ctx2hash:
+       movw r20, r22
+       ldi r22, lo8(256)
+       ldi r23, hi8(256)
+       .endfunc
+
 /*
 void keccak_ctx2hash(void* dest, uint16_t length_b, keccak_ctx_t* ctx){
        while(length_b>=ctx->r){
@@ -633,13 +669,13 @@ void keccak_ctx2hash(void* dest, uint16_t length_b, keccak_ctx_t* ctx){
        memcpy(dest, ctx->a, (length_b+7)/8);
 }
 */
-;      .global keccak_ctx2hash
-;      .func keccak_ctx2hash
-;keccak_ctx2hash:
+       .global keccak_ctx2hash
+       .func keccak_ctx2hash
+keccak_ctx2hash:
        push_range 2, 10
        movw r4, r20
        movw r6, r24
-       movw ZL, r24
+       movw ZL, r20
        movw r8, r22
        subi ZL, lo8(-ctx_r)
        sbci ZH, hi8(-ctx_r)
@@ -650,7 +686,7 @@ void keccak_ctx2hash(void* dest, uint16_t length_b, keccak_ctx_t* ctx){
        ; length_b = (r9:r8) ; r = (r3:r2) ; (H:L)
        cp  r2, r8
        cpc r3, r9
-       rjmp 40f
+;      rjmp 40f
        brsh 40f
        movw XL, r4
        movw ZL, r6
@@ -687,5 +723,69 @@ void keccak_ctx2hash(void* dest, uint16_t length_b, keccak_ctx_t* ctx){
 99:
        pop_range 2, 10
        ret
-;      .endfunc
+       .endfunc
+
+
+       .global keccak224_init
+       .func keccak224_init
+keccak224_init:
+       movw XL, r24
+       ldi r24, lo8(1152)
+       ldi r25, hi8(1152)
+       rjmp keccak_init_1
+       .endfunc
+
+       .global keccak384_init
+       .func keccak384_init
+keccak384_init:
+       movw XL, r24
+       ldi r24, lo8( 832)
+       ldi r25, hi8( 832)
+       rjmp keccak_init_1
+       .endfunc
+
+       .global keccak512_init
+       .func keccak512_init
+keccak512_init:
+       movw XL, r24
+       ldi r24, lo8( 576)
+       ldi r25, hi8( 576)
+       rjmp keccak_init_1
+       .endfunc
+
+       .global keccak256_init
+       .func keccak256_init
+keccak256_init:
+       movw r22, r24
+       ldi r24, lo8(1088)
+       ldi r25, hi8(1088)
+       .endfunc
+/*
+void keccak_init(uint16_t r, keccak_ctx_t* ctx){
+       memset(ctx->a, 0x00, 5 * 5 * 8);
+       ctx->r = r;
+       ctx->bs = (uint8_t)(r / 8);
+}
+*/
+       .global keccak_init
+       .func keccak_init
+keccak_init:
+       movw XL, r22
+keccak_init_1:
+       ldi r22, 200
+10:
+       st X+, __zero_reg__
+       dec r22
+       brne 10b
+       st X+, r24
+       st X+, r25
+       lsr r25
+       ror r24
+       lsr r25
+       ror r24
+       lsr r25
+       ror r24
+       st X+, r24
+       ret
+       .endfunc