X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=host%2Fshavs_test.rb;h=4c8589dc902938b5926bfb7fda3e036c5dea5a68;hb=4f50c75ee5a6cc88bf7ea71957ed509e298e6c25;hp=1ce86fbcd69686c9ece0f3183161e29cc564e439;hpb=4147d732efd04605764a2820d4478f33a0cdf1fa;p=avr-crypto-lib.git

diff --git a/host/shavs_test.rb b/host/shavs_test.rb
index 1ce86fb..4c8589d 100644
--- a/host/shavs_test.rb
+++ b/host/shavs_test.rb
@@ -2,7 +2,7 @@
 # shavs_test.rb
 =begin
     This file is part of the AVR-Crypto-Lib.
-    Copyright (C) 2008  Daniel Otte (daniel.otte@rub.de)
+    Copyright (C) 2008, 2009  Daniel Otte (daniel.otte@rub.de)
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -18,23 +18,27 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 =end
 
-$debug = false
+$debug = true;
+$debug = false;
 require 'rubygems'
 require 'serialport'
 
 def init_system
   sleep 1
   $sp.print("echo  off \r")
+  print("DBG i: " + "echo  off \r"+"\n") if $debug
 #  line = $sp.readlines()
 #  print("DBG 0.0: ")
 #  print(line)
 #  sleep 1
   $sp.print("shavs_set #{$algo_select} \r")
+  print("DBG i: " + "shavs_set #{$algo_select} \r"+"\n") if $debug
 #  line = $sp.readlines()
 #  print("DBG 0.1: ")
 #  print(line)
 #  sleep 1
   $sp.print("shavs_test1 \r")
+  print("DBG i: " + "shavs_test1 \r"+"\n") if $debug
 #  line = $sp.readlines()
 #  print("DBG 0.2: ")
 #  print(line)
@@ -52,7 +56,7 @@ end
 def send_md(md_string)
   for i in 0..md_string.length-1
     $sp.print(md_string[i].chr)
-#	print(md_string[i].chr)
+#	print("DBG s: "+ md_string[i].chr) if $debug
 	if(i%20==19)
 		sleep(0.1)
 	end		
@@ -61,12 +65,14 @@ end
 
 def run_test(filename)
   errors = 0
+  line=1
   if not File.exist?(filename)
   	puts("ERROR file "+filename+" does not exist!")
   end
   pos = 0
   file = File.new(filename, "r");
   until file.eof
+    sleep(0.5)
     begin
       lb=file.gets()
     end while not (file.eof or (/[\s]*Len[\s]*=.*/.match(lb)))
@@ -88,12 +94,14 @@ def run_test(filename)
 	b = (/[\s]*MD[\s]*=[\s]*([0-9a-fA-F]*).*/.match(avr_md))[1];
 	a.upcase!
 	b.upcase!
-	puts("") if (pos%$linewidth==0 and $linewidth!=0)
+	printf("\n%4d (%4d): ", line, (line-1)*$linewidth) if (pos%$linewidth==0 and $linewidth!=0)
+	line += 1               if (pos%$linewidth==0 and $linewidth!=0)
 	#putc((a==b)?'*':'!')
 	if(a==b)
 	  putc('*')
 	else
 	  putc('!')
+	#  printf("\nshould: %s\ngot:   %s\n",lb,avr_md)
 	  errors += 1;
 	end  
 	pos += 1
@@ -125,12 +133,13 @@ $algo_select = ARGV[4]
 
 init_system()
 
+errors = 0
 for i in (5..(ARGV.size-1))
   errors = run_test(ARGV[i])
   if errors == 0
-    puts("[ok]")
+    puts("\n[ok]")
   else
-    puts("[errors: "+errors.to_s+"]")
+    puts("\n[errors: "+errors.to_s+"]")
   end
 end
  $sp.print("EXIT\r");