X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=seed_C.c;h=7a9afc03bc18860c093543c485fa6db79c1180f3;hb=a5cb349f9d72e0d2c82730647b4f142de6b7e485;hp=e4b77f519b33db198f0c3b1a037ab6f9c77bdda3;hpb=20f6d949b700a12d88447b186e48c2492296dd9d;p=avr-crypto-lib.git

diff --git a/seed_C.c b/seed_C.c
index e4b77f5..7a9afc0 100644
--- a/seed_C.c
+++ b/seed_C.c
@@ -1,6 +1,6 @@
 /* seed_C.c */
 /*
-    This file is part of the Crypto-avr-lib/microcrypt-lib.
+    This file is part of the AVR-Crypto-Lib.
     Copyright (C) 2008  Daniel Otte (daniel.otte@rub.de)
 
     This program is free software: you can redistribute it and/or modify
@@ -29,7 +29,7 @@
 #include <avr/pgmspace.h>
 #include <string.h>
 #include "seed_sbox.h"
-#include "uart.h"
+#include "cli.h"
 #include "debug.h"
 
 
@@ -206,7 +206,7 @@ typedef struct{
 
 /******************************************************************************/
 
-void seed_init(uint8_t * key, seed_ctx_t * ctx){
+void seed_init(const void * key, seed_ctx_t * ctx){
 	memcpy(ctx->k, key, 128/8);
 }
 
@@ -215,25 +215,25 @@ void seed_init(uint8_t * key, seed_ctx_t * ctx){
 #define L (((uint64_t*)buffer)[0])
 #define R (((uint64_t*)buffer)[1])
 
-void seed_enc(void * buffer, seed_ctx_t * ctx){
+void seed_enc(void * buffer, const seed_ctx_t * ctx){
 	uint8_t r;
 	keypair_t k;
 	for(r=0; r<8; ++r){
-			k = getnextkeys(ctx->k, 2*r);
+			k = getnextkeys(((seed_ctx_t*)ctx)->k, 2*r);
 /*
-	DEBUG_S("\r\n\tDBG ka,0: "); uart_hexdump(&k.k0, 4);
-	DEBUG_S("\r\n\tDBG ka,1: "); uart_hexdump(&k.k1, 4);
-	DEBUG_S("\r\n\t DBG L: "); uart_hexdump((uint8_t*)buffer+0, 8);
-	DEBUG_S("\r\n\t DBG R: "); uart_hexdump((uint8_t*)buffer+8, 8);
+	DEBUG_S("\r\n\tDBG ka,0: "); cli_hexdump(&k.k0, 4);
+	DEBUG_S("\r\n\tDBG ka,1: "); cli_hexdump(&k.k1, 4);
+	DEBUG_S("\r\n\t DBG L: "); cli_hexdump((uint8_t*)buffer+0, 8);
+	DEBUG_S("\r\n\t DBG R: "); cli_hexdump((uint8_t*)buffer+8, 8);
 */
 			L ^= f_function(&R,k.k0,k.k1);
 			
-			k = getnextkeys(ctx->k, 2*r+1);
+			k = getnextkeys(((seed_ctx_t*)ctx)->k, 2*r+1);
 /*
-	DEBUG_S("\r\n\tDBG kb,0: "); uart_hexdump(&k.k0, 4);
-	DEBUG_S("\r\n\tDBG kb,1: "); uart_hexdump(&k.k1, 4);
-	DEBUG_S("\r\n\t DBG L: "); uart_hexdump((uint8_t*)buffer+8, 8);
-	DEBUG_S("\r\n\t DBG R: "); uart_hexdump((uint8_t*)buffer+0, 8);
+	DEBUG_S("\r\n\tDBG kb,0: "); cli_hexdump(&k.k0, 4);
+	DEBUG_S("\r\n\tDBG kb,1: "); cli_hexdump(&k.k1, 4);
+	DEBUG_S("\r\n\t DBG L: "); cli_hexdump((uint8_t*)buffer+8, 8);
+	DEBUG_S("\r\n\t DBG R: "); cli_hexdump((uint8_t*)buffer+0, 8);
 */
 			R ^= f_function(&L,k.k0,k.k1);
 	}
@@ -252,21 +252,21 @@ void seed_dec(void * buffer, seed_ctx_t * ctx){
 	int8_t r;
 	keypair_t k;
 	for(r=7; r>=0; --r){
-			k = getprevkeys(ctx->k, 2*r+1);
+			k = getprevkeys(((seed_ctx_t*)ctx)->k, 2*r+1);
 /*
-	DEBUG_S("\r\n\tDBG ka,0: "); uart_hexdump(&k.k0, 4);
-	DEBUG_S("\r\n\tDBG ka,1: "); uart_hexdump(&k.k1, 4);
-	DEBUG_S("\r\n\t DBG L: "); uart_hexdump((uint8_t*)buffer+0, 8);
-	DEBUG_S("\r\n\t DBG R: "); uart_hexdump((uint8_t*)buffer+8, 8);
+	DEBUG_S("\r\n\tDBG ka,0: "); cli_hexdump(&k.k0, 4);
+	DEBUG_S("\r\n\tDBG ka,1: "); cli_hexdump(&k.k1, 4);
+	DEBUG_S("\r\n\t DBG L: "); cli_hexdump((uint8_t*)buffer+0, 8);
+	DEBUG_S("\r\n\t DBG R: "); cli_hexdump((uint8_t*)buffer+8, 8);
 */
 			L ^= f_function(&R,k.k0,k.k1);
 			
-			k = getprevkeys(ctx->k, 2*r+0);
+			k = getprevkeys(((seed_ctx_t*)ctx)->k, 2*r+0);
 /*
-	DEBUG_S("\r\n\tDBG kb,0: "); uart_hexdump(&k.k0, 4);
-	DEBUG_S("\r\n\tDBG kb,1: "); uart_hexdump(&k.k1, 4);
-	DEBUG_S("\r\n\t DBG L: "); uart_hexdump((uint8_t*)buffer+8, 8);
-	DEBUG_S("\r\n\t DBG R: "); uart_hexdump((uint8_t*)buffer+0, 8);
+	DEBUG_S("\r\n\tDBG kb,0: "); cli_hexdump(&k.k0, 4);
+	DEBUG_S("\r\n\tDBG kb,1: "); cli_hexdump(&k.k1, 4);
+	DEBUG_S("\r\n\t DBG L: "); cli_hexdump((uint8_t*)buffer+8, 8);
+	DEBUG_S("\r\n\t DBG R: "); cli_hexdump((uint8_t*)buffer+0, 8);
 */
 			R ^= f_function(&L,k.k0,k.k1);
 	}