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;
}
- 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 {
}
}
-void shavs_test1(void){
+void shavs_test1(void){ /* KAT tests */
uint32_t length=0;
int32_t expect_input=0;
return;
}
char c;
- uint8_t diggest[pgm_read_word(shavs_algo->hashsize_b)/8];
+ uint8_t diggest[pgm_read_word(&(shavs_algo->hashsize_b))/8];
shavs_ctx.buffersize_B=pgm_read_word(&(shavs_algo->blocksize_b))/8;
- uint8_t buffer[shavs_ctx.buffersize_B+1];
+ uint8_t buffer[shavs_ctx.buffersize_B+5];
shavs_ctx.buffer = buffer;
cli_putstr_P(PSTR("\r\nbuffer_size = 0x"));
cli_hexdump_rev(&(shavs_ctx.buffersize_B), 2);
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 == "));
cli_putstr_P(PSTR("\r\n\t (temp) == "));
cli_hexdump_rev(&temp,2);
_delay_ms(500);
-#endif
+ temp=length-(shavs_ctx.blocks)*((shavs_ctx.buffersize_B)*8);
+#else
uint16_t temp=length-(shavs_ctx.blocks)*((shavs_ctx.buffersize_B)*8);
-/* cli_putstr_P(PSTR("\r\n\t (temp) == "));
- cli_hexdump_rev(&temp,2); */
+#endif
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"));
}
}
+void shavs_test2(void){ /* Monte Carlo tests for SHA-1 & SHA-2 */
+ uint16_t expected_input;
+ uint16_t count;
+ uint8_t v;
+ uint8_t index=0;
+ char c;
+ if(!shavs_algo){
+ cli_putstr_P(PSTR("\r\nERROR: select algorithm first!"));
+ return;
+ }
+ uint8_t ml=pgm_read_word(&(shavs_algo->hashsize_b))/8;
+ uint8_t m[ml*4+8];
+ for(;;){
+ while((c=cli_getc_cecho())!='S' && c!='s'){
+ if(!isblank(c)){
+ cli_putstr_P(PSTR("\r\nERROR: wrong input (1) [0x"));
+ cli_hexdump(&c, 1);
+ cli_putstr_P(PSTR("]!\r\n"));
+ return;
+ }
+ }
+ if((c=cli_getc_cecho())!='e' && c!='e'){
+ cli_putstr_P(PSTR("\r\nERROR: wrong input (2)!\r\n"));
+ return;
+ }
+ if((c=cli_getc_cecho())!='e' && c!='e'){
+ cli_putstr_P(PSTR("\r\nERROR: wrong input (3)!\r\n"));
+ return;
+ }
+ if((c=cli_getc_cecho())!='d' && c!='D'){
+ cli_putstr_P(PSTR("\r\nERROR: wrong input (4)!\r\n"));
+ return;
+ }
+ while((c=cli_getc_cecho())!='='){
+ if(!isblank(c)){
+ cli_putstr_P(PSTR("\r\nERROR: wrong input (5)!\r\n"));
+ return;
+ }
+ }
+ expected_input = ml*2;
+ memset(m+2*ml, 0, ml);
+ do{
+ v=0xff;
+ c=cli_getc_cecho();
+ if(c>='0' && c<='9'){
+ v = c - '0';
+ }else{
+ c |= 'A'^'a';
+ if(c>='a' && c<='f'){
+ v = c - 'a' +10;
+ }
+ }
+ if(v<0x10){
+ c=m[ml*2+index/2];
+ if(index&1){
+ c |= v;
+ }else{
+ c |=v<<4;
+ }
+ m[ml*2+index/2]=c;
+ index++;
+ expected_input--;
+ }
+ }while(expected_input);
+ /* so we have the seed */
+ cli_putstr_P(PSTR("\r\nstarting processing"));
+ uint16_t j;
+ for(count=0; count<100; ++count){
+ memcpy(m, m+ml*2, ml);
+ memcpy(m+ml, m+ml*2, ml);
+ for(j=0; j<1000; ++j){
+ hfal_hash_mem(shavs_algo, m+ml*3, m, ml*3*8);
+ memmove(m, m+ml, 3*ml);
+ }
+ cli_putstr_P(PSTR("\r\n\r\nCOUNT = "));
+ if(count>=10){
+ cli_putc(count/10+'0');
+ }
+ cli_putc(count%10+'0');
+ cli_putstr_P(PSTR("\r\nMD = "));
+ cli_hexdump(m+ml*2, ml);
+ }
+ }
+}
+
+void shavs_test3(void){ /* Monte Carlo tests for SHA-3 */
+ uint16_t expected_input;
+ uint16_t count;
+ uint8_t v;
+ uint8_t index=0;
+ char c;
+ if(!shavs_algo){
+ cli_putstr_P(PSTR("\r\nERROR: select algorithm first!"));
+ return;
+ }
+ uint8_t ml=pgm_read_word(&(shavs_algo->hashsize_b))/8;
+ uint8_t m[ml+128];
+ for(;;){
+ while((c=cli_getc_cecho())!='S' && c!='s'){
+ if(!isblank(c)){
+ cli_putstr_P(PSTR("\r\nERROR: wrong input (1) [0x"));
+ cli_hexdump(&c, 1);
+ cli_putstr_P(PSTR("]!\r\n"));
+ return;
+ }
+ }
+ if((c=cli_getc_cecho())!='e' && c!='e'){
+ cli_putstr_P(PSTR("\r\nERROR: wrong input (2)!\r\n"));
+ return;
+ }
+ if((c=cli_getc_cecho())!='e' && c!='e'){
+ cli_putstr_P(PSTR("\r\nERROR: wrong input (3)!\r\n"));
+ return;
+ }
+ if((c=cli_getc_cecho())!='d' && c!='D'){
+ cli_putstr_P(PSTR("\r\nERROR: wrong input (4)!\r\n"));
+ return;
+ }
+ while((c=cli_getc_cecho())!='='){
+ if(!isblank(c)){
+ cli_putstr_P(PSTR("\r\nERROR: wrong input (5)!\r\n"));
+ return;
+ }
+ }
+ expected_input = 1024/4;
+ memset(m+ml, 0, 1024/8);
+ do{
+ v=0xff;
+ c=cli_getc_cecho();
+ if(c>='0' && c<='9'){
+ v = c - '0';
+ }else{
+ c |= 'A'^'a';
+ if(c>='a' && c<='f'){
+ v = c - 'a' +10;
+ }
+ }
+ if(v<0x10){
+ c=m[ml+index/2];
+ if(index&1){
+ c |= v;
+ }else{
+ c |=v<<4;
+ }
+ m[ml+index/2]=c;
+ index++;
+ expected_input--;
+ }
+ }while(expected_input);
+ /* so we have the seed */
+ cli_putstr_P(PSTR("\r\nstarting processing"));
+ uint16_t j;
+ for(count=0; count<100; ++count){
+ for(j=0; j<1000; ++j){
+ hfal_hash_mem(shavs_algo, m, m+ml, 1024);
+ memmove(m+ml, m, 1024/8);
+ }
+ cli_putstr_P(PSTR("\r\n\r\nj = "));
+ if(count>=10){
+ cli_putc(count/10+'0');
+ }
+ cli_putc(count%10+'0');
+ cli_putstr_P(PSTR("\r\nMD = "));
+ cli_hexdump(m+ml, ml);
+
+ }
+ }
+}
projects / avr-crypto-lib.git / blobdiff