noekeon extended

diff --git a/noekeon.mk b/noekeon.mk
index 901c7fc06d52b38a988f80243eb5cc1971ea14d9..3f1a313f887bbe3b7506538ead6b8462baf059d3 100644 (file)
--- a/noekeon.mk
+++ b/noekeon.mk
@@ -5,11 +5,10 @@ ALGO_NAME := NOEKEON
 BLOCK_CIPHERS += $(ALGO_NAME)
 
 
-$(ALGO_NAME)_OBJ      := noekeon_asmC.o noekeon_asm.o
-#$(ALGO_NAME)_OBJ      := noekeon.o
+$(ALGO_NAME)_OBJ      := noekeon_asm.o
 $(ALGO_NAME)_TEST_BIN := main-noekeon-test.o debug.o uart.o serial-tools.o \
-                         noekeon_asmC.o noekeon_asm.o nessie_bc_test.o \
+                         noekeon_asm.o nessie_bc_test.o \
                          nessie_common.o cli.o performance_test.o
-$(ALGO_NAME)_NESSIE_TEST      := "nessie"
-$(ALGO_NAME)_PEROFRMANCE_TEST := "performance"
+$(ALGO_NAME)_NESSIE_TEST      := test nessie
+$(ALGO_NAME)_PEROFRMANCE_TEST := performance
 

diff --git a/noekeon_asm.S b/noekeon_asm.S
index f3f904dcc21303f2048185f024c0c8034b225e80..43ffa93a33f9a39714bfe8a5a420ecd144ecb311 100644 (file)
--- a/noekeon_asm.S
+++ b/noekeon_asm.S
@@ -574,61 +574,60 @@ pi:
        mov state3_2, r24
        mov state3_3, r25
        ret
-       
-;------- trash follows --------
-
 
+/******************************************************************************/
+       
+/*
+void noekeon_init(void* key, noekeon_ctx_t* ctx){
+       uint8_t nullv[16];
+       
+       memset(nullv, 0, 16);
+       memcpy(ctx, key, 16);
+       noekeon_enc(ctx, nullv);
+}
+*/
+.global noekeon_init
+noekeon_init:
+; === noekeon_init ===
+;
+;  param1: pointer to key (r24,r25)
+;  param2: pointer to context  (r22,r23) 
+;
+       in r30, _SFR_IO_ADDR(SPL)
+       in r31, _SFR_IO_ADDR(SPH)
+       sbiw r30, 16 
+       out  _SFR_IO_ADDR(SPH), r31
+       out  _SFR_IO_ADDR(SPL), r30
 
-       /* load state */
        movw r26, r22
-       ldi r28, 2
-       clr r29 /* Y points at r2 aka state0_0 */
-       ldi r22, 16     
-1:     /* copy key to state */
-       ld r0, X+
-       st Y+, r0
-       dec r22
-       brne 1b
-
-       movw r26, r30
-       
-       clr r1
-       ldi r22, 16
-1:     /* set key to zero */
-       st Z+, r1
-       dec r22
+       adiw r30, 1
+       movw r22, r30
+       /* set nullv(stack) to zero */
+       ldi r20, 16
+1:     st Z+, r1
+       dec r20
        brne 1b
-               
-       call theta
 
-       ldi r22, 16
-1:     /* write key back */    
-       ld r0, -Y
-       st -Z, r0
-       dec r22
+       /* copy key data to ctx */
+       movw r30, r24
+       ldi r20, 16
+1:     ld r1, Z+
+       st X+, r1
+       dec r20
        brne 1b
-
-;      movw r26, r30 /* move keypointer to X */
-;      adiw r26, 1
-       movw r30, r24 /* Z points at state */
-       push r30 /* push state pointer */
-       push r31
+       clr r1
+       
+       sbiw r26, 16
+       movw r24, r26
+       call noekeon_enc
+       
+       in r30, _SFR_IO_ADDR(SPL)
+       in r31, _SFR_IO_ADDR(SPH)
+       adiw r30, 16 
+       out  _SFR_IO_ADDR(SPH), r31
+       out  _SFR_IO_ADDR(SPL), r30     
+       ret
        
-       ;--
-       clr r29
-       ldi r28, 2
-       ;--
-       ldi r22, 16
-       push r22 /* 16 is also the number of rounds and gets pushed here */
-       ldi r22, 16
-1:     /* load state */
-       ld r0, Z+
-       st Y+, r0
-       dec r22
-       brne 1b
-       /* state loaded */
-
 
-;------- ------------- --------