backporting uart_i and cli

[avr-crypto-lib.git] / seed_C.c

diff --git a/seed_C.c b/seed_C.c
index e93da31165a80f80637f3cb776e88081879f23fe..7a9afc03bc18860c093543c485fa6db79c1180f3 100644 (file)
--- a/seed_C.c
+++ b/seed_C.c
@@ -1,6 +1,6 @@
 /* seed_C.c */
 /*
-    This file is part of the This file is part of the AVR-Crypto-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"
 
 
@@ -221,19 +221,19 @@ void seed_enc(void * buffer, const seed_ctx_t * ctx){
        for(r=0; r<8; ++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(((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);
        }
@@ -254,19 +254,19 @@ void seed_dec(void * buffer, seed_ctx_t * ctx){
        for(r=7; r>=0; --r){
                        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(((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);
        }