#include <string.h>
#include <ctype.h>
#include "hashfunction_descriptor.h"
-#include "hfal/hfal-basic.h"
+#include "hfal-basic.h"
#include "shavs.h"
#include "string-extras.h"
#include "cli.h"
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];
if(*len2=='='){
do{
len2++;
- }while(*len2 && !isdigit(*len2));
- len=(uint32_t)strtoul(len2, NULL, 10);
+ }while(*len2 && !isdigit((uint8_t)*len2));
+ len = my_strtoul(len2);
+ //len=(uint32_t)strtoul(len2, NULL, 10);
return len;
}
} else {
if(length==0){
expect_input=2;
}else{
- expect_input=((length+7)>>2)&(~1L);
+ expect_input=((length + 7) >> 2) & (~1L);
}
#if DEBUG
cli_putstr_P(PSTR("\r\nexpected_input == "));
#else
uint16_t temp=length-(shavs_ctx.blocks)*((shavs_ctx.buffersize_B)*8);
#endif
- /* cli_putstr_P(PSTR("\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_P(PSTR("\r\n starting ctx2hash"));