X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=noekeon.c;h=5508c29520ac1a50ee744ab9da59b34509b682ef;hb=0f66a12e93ed43904c30810ac33c79c87befafe7;hp=dd68b6575e6121c8c2b334d4a79d731efae43194;hpb=9e7453525f32441ea49ef1d9b3248e94d9554eec;p=avr-crypto-lib.git
diff --git a/noekeon.c b/noekeon.c
index dd68b65..5508c29 100644
--- a/noekeon.c
+++ b/noekeon.c
@@ -1,7 +1,25 @@
+/* noekeon.c */
+/*
+ This file is part of the Crypto-avr-lib/microcrypt-lib.
+ Copyright (C) 2008 Daniel Otte (daniel.otte@rub.de)
+
+ 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
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see .
+*/
/*
* author: Daniel Otte
* email: daniel.otte@rub.de
- * license: GPLv3
+ * license: GPLv3 or later
*
*
*
@@ -11,6 +29,7 @@
#include
#include
#include "noekeon.h"
+// #include "uart.h"
#define ROUND_NR 16
@@ -50,6 +69,7 @@ void pi2(uint32_t* a){
static
void theta(uint32_t* k, uint32_t* a){
uint32_t temp;
+
temp = a[0] ^ a[2]; temp ^= ROTR32(temp, 8) ^ ROTL32(temp, 8);
a[1] ^= temp;
a[3] ^= temp;
@@ -62,6 +82,7 @@ void theta(uint32_t* k, uint32_t* a){
temp = a[1] ^ a[3]; temp ^= ROTR32(temp, 8) ^ ROTL32(temp, 8);
a[0] ^= temp;
a[2] ^= temp;
+
}
static
@@ -139,6 +160,9 @@ void noekeon_dec(void* buffer, void* key){
memcpy(dkey, key, 16);
theta((uint32_t*)nullv, (uint32_t*)dkey);
+// uart_putstr_P(PSTR("\r\nTheta: "));
+// uart_hexdump(dkey, 16);
+
for(i=ROUND_NR-1; i>=0; --i){
rc = pgm_read_byte(rc_tab+i);
noekeon_round((uint32_t*)dkey, (uint32_t*)buffer, 0, rc);