#define DEBUG 0
#if DEBUG
+#include "uart_lowlevel.h"
//# include "config.h"
//# include <util/delay.h>
#endif
static shavs_ctx_t shavs_ctx;
+static
uint8_t buffer_add(char c){
uint8_t v,t;
if(shavs_ctx.buffer_idx==shavs_ctx.buffersize_B){
hfal_hash_nextBlock(&(shavs_ctx.ctx), shavs_ctx.buffer);
++shavs_ctx.blocks;
shavs_ctx.buffer_idx=0;
- shavs_ctx.in_byte=0;
cli_putc('.');
- memset(shavs_ctx.buffer, 0, shavs_ctx.buffersize_B);
}
if(c>='0' && c<='9'){
v=c-'0';
t=shavs_ctx.buffer[shavs_ctx.buffer_idx];
if(shavs_ctx.in_byte){
t |= v;
- shavs_ctx.buffer[shavs_ctx.buffer_idx]=t;
+ shavs_ctx.buffer[shavs_ctx.buffer_idx] = t;
shavs_ctx.buffer_idx++;
shavs_ctx.in_byte = 0;
}else{
- t |= v<<4;
- shavs_ctx.buffer[shavs_ctx.buffer_idx]=t;
+ t = v<<4;
+ shavs_ctx.buffer[shavs_ctx.buffer_idx] = t;
shavs_ctx.in_byte = 1;
}
return 0;
}
+static
+uint32_t my_strtoul(const char* str){
+ uint32_t r=0;
+ while(*str && (*str<'0' || *str>'9')){
+ str++;
+ }
+ if(!*str){
+ return 0;
+ }
+ while(*str && (*str>='0' && *str<='9')){
+ r *= 10;
+ r += *str-'0';
+ str++;
+ }
+ return r;
+}
+
int32_t getLength(void){
uint32_t len=0;
- char lenstr[21];
+ char lenstr[25];
char* len2;
for(;;){
memset(lenstr, 0, 21);
do{
len2++;
}while(*len2 && !isdigit((uint8_t)*len2));
- len=(uint32_t)strtoul(len2, NULL, 10);
+ len = my_strtoul(len2);
+ //len=(uint32_t)strtoul(len2, NULL, 10);
return len;
}
} else {
shavs_ctx.blocks = 0;
memset(buffer, 0, shavs_ctx.buffersize_B);
length = getLength();
- if(length<0){
+ if((int32_t)length<0){
+#if DEBUG
+ cli_putstr("\r\n(x) Len == ");
+ cli_hexdump_rev(&length, 4);
+ uart_flush(0);
+#endif
return;
}
#if DEBUG
cli_putstr("\r\nLen == ");
cli_hexdump_rev(&length, 4);
+ uart_flush(0);
#endif
if(length==0){
expect_input=2;
}else{
- expect_input=((length+7)>>2)&(~1L);
+ expect_input=((length + 7) >> 2) & (~1L);
}
#if DEBUG
cli_putstr("\r\nexpected_input == ");
cli_putstr("\r\nBuffer-A:");
cli_hexdump_block(buffer, shavs_ctx.buffersize_B, 5, 8);
- cli_putstr("\r\n starting finalisation");
+ cli_putstr("\r\n starting finalization");
cli_putstr("\r\n\tblocks == ");
cli_hexdump_rev(&(shavs_ctx.blocks),4);
cli_putstr("\r\n\tbuffer_idx == ");
uint16_t temp=length-(shavs_ctx.blocks)*((shavs_ctx.buffersize_B)*8);
cli_putstr("\r\n\t (temp) == ");
cli_hexdump_rev(&temp,2);
- temp=length-(shavs_ctx.blocks)*((shavs_ctx.buffersize_B)*8);
#else
uint16_t temp=length-(shavs_ctx.blocks)*((shavs_ctx.buffersize_B)*8);
#endif
- /* cli_putstr("\r\n\t (temp) == ");
- cli_hexdump_rev(&temp,2); */
hfal_hash_lastBlock( &(shavs_ctx.ctx), buffer, /* be aware of freaking compilers!!! */
-// length-(shavs_ctx.blocks)*((shavs_ctx.buffersize_B)*8));
temp );
#if DEBUG
cli_putstr("\r\n starting ctx2hash");
return;
}
}
- if((c=cli_getc_cecho())!='e' && c!='e'){
+ if((c=cli_getc_cecho())!='e' && c!='E'){
cli_putstr("\r\nERROR: wrong input (2)!\r\n");
return;
}
- if((c=cli_getc_cecho())!='e' && c!='e'){
+ if((c=cli_getc_cecho())!='e' && c!='E'){
cli_putstr("\r\nERROR: wrong input (3)!\r\n");
return;
}
return;
}
}
- if((c=cli_getc_cecho())!='e' && c!='e'){
+ if((c=cli_getc_cecho())!='e' && c!='E'){
cli_putstr("\r\nERROR: wrong input (2)!\r\n");
return;
}
- if((c=cli_getc_cecho())!='e' && c!='e'){
+ if((c=cli_getc_cecho())!='e' && c!='E'){
cli_putstr("\r\nERROR: wrong input (3)!\r\n");
return;
}