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

diff --git a/host/shavs_test.rb b/host/shavs_test.rb
index 1ce86fb..3960bce 100644
--- a/host/shavs_test.rb
+++ b/host/shavs_test.rb
@@ -1,8 +1,8 @@
-#!/usr/bin/ruby 
+#!/usr/bin/ruby
 # 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,31 @@
     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")
+#  sleep 1
+  $sp.print("exit\r")
+  sleep 0.1
+  $sp.print("exit\r")
+  sleep 0.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")
+  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
+  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)
@@ -46,27 +54,29 @@ def get_md
 	line = "" if line==nil
 	puts("DBG g: "+line) if $debug
   end while not /[\s]*MD[\s]*=.*/.match(line)
-  return line	
+  return line
 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		
+		sleep(0.15)
+	end
   end
 end
 
 def run_test(filename)
-  errors = 0
+  nerrors = 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,17 +98,19 @@ 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('!')
-	  errors += 1;
-	end  
+	  printf("\nshould: %s\ngot:   %s\n",lb,avr_md)
+	  nerrors += 1
+	end
 	pos += 1
   end
-  return errors
+  return nerrors.to_i
 end
 
 if ARGV.size < 6
@@ -111,9 +123,9 @@ end
 puts("\nPort: "+ARGV[0]+ "@"+ARGV[1]+" "+ARGV[2]+"N"+ARGV[3]+"\n");
 puts("serial port interface version: " + SerialPort::VERSION);
 $linewidth = 64
-$params = { "baud"      => ARGV[1].to_i, 
-            "data_bits" => ARGV[2].to_i, 
-            "stop_bits" => ARGV[3].to_i, 
+$params = { "baud"      => ARGV[1].to_i,
+            "data_bits" => ARGV[2].to_i,
+            "stop_bits" => ARGV[3].to_i,
             "parity"    => SerialPort::NONE }
 $sp = SerialPort.new(ARGV[0], $params)
 #$sp = SerialPort.new(ARGV[0], ARGV[1].to_i, ARGV[2].to_i, ARGV[3].to_i, SerialPort::NONE);
@@ -125,12 +137,13 @@ $algo_select = ARGV[4]
 
 init_system()
 
+nerrors = 0
 for i in (5..(ARGV.size-1))
-  errors = run_test(ARGV[i])
-  if errors == 0
-    puts("[ok]")
+  nerrors = run_test(ARGV[i])
+  if nerrors == 0
+    puts("\n[ok]")
   else
-    puts("[errors: "+errors.to_s+"]")
+    puts("\n[errors: "+ nerrors.to_s() +"]")
   end
 end
  $sp.print("EXIT\r");