fixing E-Mail-Address & Copyright

[avr-crypto-lib.git] / skein / threefish256_enc_asm.S

diff --git a/skein/threefish256_enc_asm.S b/skein/threefish256_enc_asm.S
index dfa5d05c4ff175bfe67db101845b9b8a3788b2fd..f2766af23c7402d9c4853facd71b310ab3986950 100644 (file)
--- a/skein/threefish256_enc_asm.S
+++ b/skein/threefish256_enc_asm.S
@@ -1,7 +1,7 @@
 /* threefish256_enc_asm.S */
 /*
     This file is part of the AVR-Crypto-Lib.
-    Copyright (C) 2009  Daniel Otte (daniel.otte@rub.de)
+    Copyright (C) 2006-2015 Daniel Otte (bg@nerilex.org)
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
 */
 /*
  * \author  Daniel Otte
- * \email   daniel.otte@rub.de
+ * \email   bg@nerilex.org
  * \date    2009-03-16
  * \license GPLv3 or later
  */
@@ -40,7 +40,7 @@ A7 = 21
 #define K(s) (((uint64_t*)key)[(s)])
 #define T(s) (((uint64_t*)tweak)[(s)])
 
-void threefish256_init(void* key, void* tweak, threefish256_ctx_t* ctx){
+void threefish256_init(void *key, void *tweak, threefish256_ctx_t *ctx){
        memcpy(ctx->k, key, 4*8);
        memcpy(ctx->t, tweak, 2*8);
        uint8_t i;
@@ -62,11 +62,20 @@ threefish256_init:
        movw r30, r20
        movw r26, r24
        ldi r24, 4
-       ldi A7, 0x55
-       mov A6, A7
-       movw A4, A6
-       movw A2, A6
+;      ldi A7, 0x55
+;      mov A6, A7
+;      movw A4, A6
+;      movw A2, A6
+;      movw A0, A6
+       ldi A6, 0x22 ; 0x1BD1.1BDA.A9FC.1A22
+       ldi A7, 0x1A
        movw A0, A6
+       ldi A2, 0xFC
+       ldi A3, 0xA9
+       ldi A4, 0xDA
+       ldi A5, 0x1B
+       ldi A6, 0xD1
+       ldi A7, 0x1B
 1:
        ld r0, X+
        st Z+, r0
@@ -171,19 +180,19 @@ threefish256_init:
 /******************************************************************************/
 /*
 #define X(a) (((uint64_t*)data)[(a)])
-void permute_4(void* data){
+void permute_4(void *data){
        uint64_t t;
        t = X(1);
        X(1) = X(3);
        X(3) = t;
 }
-void add_key_4(void* data, threefish256_ctx_t* ctx, uint8_t s){ / * s: 0..19 * /
+void add_key_4(void *data, threefish256_ctx_t *ctx, uint8_t s){ / * s: 0..19 * /
        X(0) += ctx->k[(s+0)%5];
        X(1) += ctx->k[(s+1)%5] + ctx->t[s%3];
        X(2) += ctx->k[(s+2)%5] + ctx->t[(s+1)%3];
        X(3) += ctx->k[(s+3)%5] + s;
 }
-void threefish256_enc(void* data, threefish256_ctx_t* ctx){
+void threefish256_enc(void *data, threefish256_ctx_t *ctx){
        uint8_t i=0,s=0;
        uint8_t r0[8] = { 5, 36, 13, 58, 26, 53, 11, 59};
        uint8_t r1[8] = {56, 28, 46, 44, 20, 35, 42, 50};
@@ -373,8 +382,12 @@ threefish256_slut3:
        .byte 0x08, 0x10, 0x00, 0x08, 0x10, 0x00, 0x08
 ;threefish256_rc0: .byte  5, 36, 13, 58, 26, 53, 11, 59
 ;threefish256_rc1: .byte 56, 28, 46, 44, 20, 35, 42, 50
+/* old round constants
 threefish256_rc0: .byte 0x1b, 0x44, 0x2b, 0x72, 0x32, 0x7b, 0x13, 0x73
 threefish256_rc1: .byte 0x70, 0x34, 0x6a, 0x54, 0x24, 0x43, 0x52, 0x62
+*/
+threefish256_rc0:  .byte 0x2a, 0x64, 0x39, 0x1b, 0x31, 0x6a, 0x72, 0x40
+threefish256_rc1:  .byte 0x20, 0x71, 0x50, 0x5b, 0x41, 0x14, 0x3a, 0x40
 
 add_z_to_x8:
        ld r0, Z+