X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fshavs.c;h=41a15514d0920c43c18023982c80cdf1b7916612;hb=92e0ee3f719d375d69300c7c1c48138d52330fcf;hp=70477c673990709a42df835b83dba0efa33b5fc9;hpb=d70d1d77bab1a5f5278227d674bc59da0378fe15;p=arm-crypto-lib.git

diff --git a/test_src/shavs.c b/test_src/shavs.c
index 70477c6..41a1551 100644
--- a/test_src/shavs.c
+++ b/test_src/shavs.c
@@ -29,7 +29,7 @@
 #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"
@@ -42,6 +42,7 @@
 #define DEBUG 0
 
 #if DEBUG
+#include "uart_lowlevel.h"
 //#  include "config.h"
 //#  include <util/delay.h>
 #endif
@@ -109,6 +110,7 @@ typedef struct {
 
 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){
@@ -143,9 +145,26 @@ uint8_t buffer_add(char c){
 	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);
@@ -157,8 +176,9 @@ int32_t getLength(void){
 			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 {
@@ -189,13 +209,19 @@ void shavs_test1(void){ /* KAT tests */
 		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;
@@ -229,7 +255,7 @@ void shavs_test1(void){ /* KAT tests */
 		cli_putstr("\r\n");
 #endif
 		while((c=cli_getc_cecho())!='M' && c!='m'){
-			if(!isblank(c)){
+			if(!isblank((uint8_t)c)){
 				cli_putstr("\r\nERROR: wrong input (1) [0x");
 				cli_hexdump(&c, 1);
 				cli_putstr("]!\r\n");
@@ -248,7 +274,7 @@ void shavs_test1(void){ /* KAT tests */
 				return;
 		}
 		while((c=cli_getc_cecho())!='='){
-			if(!isblank(c)){
+			if(!isblank((uint8_t)c)){
 				cli_putstr("\r\nERROR: wrong input (4)!\r\n");
 				hfal_hash_free(&(shavs_ctx.ctx));
 				return;
@@ -336,18 +362,18 @@ void shavs_test2(void){ /* Monte Carlo tests for SHA-1 & SHA-2 */
 	uint8_t m[ml*4+8];
 	for(;;){
 		while((c=cli_getc_cecho())!='S' && c!='s'){
-			if(!isblank(c)){
+			if(!isblank((uint8_t)c)){
 				cli_putstr("\r\nERROR: wrong input (1) [0x");
 				cli_hexdump(&c, 1);
 				cli_putstr("]!\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 (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;
 		}
@@ -356,7 +382,7 @@ void shavs_test2(void){ /* Monte Carlo tests for SHA-1 & SHA-2 */
 				return;
 		}
 		while((c=cli_getc_cecho())!='='){
-			if(!isblank(c)){
+			if(!isblank((uint8_t)c)){
 				cli_putstr("\r\nERROR: wrong input (5)!\r\n");
 				return;
 			}
@@ -421,18 +447,18 @@ void shavs_test3(void){ /* Monte Carlo tests for SHA-3 */
 	uint8_t m[ml+128];
 	for(;;){
 		while((c=cli_getc_cecho())!='S' && c!='s'){
-			if(!isblank(c)){
+			if(!isblank((uint8_t)c)){
 				cli_putstr("\r\nERROR: wrong input (1) [0x");
 				cli_hexdump(&c, 1);
 				cli_putstr("]!\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 (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;
 		}
@@ -441,7 +467,7 @@ void shavs_test3(void){ /* Monte Carlo tests for SHA-3 */
 				return;
 		}
 		while((c=cli_getc_cecho())!='='){
-			if(!isblank(c)){
+			if(!isblank((uint8_t)c)){
 				cli_putstr("\r\nERROR: wrong input (5)!\r\n");
 				return;
 			}