X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;ds=sidebyside;f=host%2Fshavs_test.rb;h=3d6ea06fc73075c709362447544ebfd99d833ff5;hb=7f4bda01ca923c4a9aca6da3370a7c4793426a5c;hp=3983b502164983a8731de00bd45ab13354dd91fb;hpb=d3db763eeb456ce00849ecf658782f95b9f5634c;p=avr-crypto-lib.git
diff --git a/host/shavs_test.rb b/host/shavs_test.rb
index 3983b50..3d6ea06 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 .
=end
-
-
+$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 a \r")
+ $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)
@@ -44,22 +48,35 @@ def get_md
begin
line = $sp.gets()
line = "" if line==nil
-# puts("DBG g: "+line)
+ puts("DBG g: "+line) if $debug
end while not /[\s]*MD[\s]*=.*/.match(line)
return line
end
+def send_md(md_string)
+ for i in 0..md_string.length-1
+ $sp.print(md_string[i].chr)
+# print("DBG s: "+ md_string[i].chr) if $debug
+ if(i%20==19)
+ sleep(0.1)
+ end
+ end
+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)))
-# puts("DBG sending: "+lb);
+ puts("DBG sending: "+lb) if $debug
return if file.eof
$sp.print(lb.strip)
$sp.print("\r")
@@ -67,8 +84,8 @@ def run_test(filename)
lb=file.gets()
end while not (file.eof or (/[\s]*Msg[\s]*=.*/.match(lb)))
return if file.eof
-# puts("DBG sending: "+lb);
- $sp.print(lb.strip)
+ puts("DBG sending: "+lb) if $debug
+ send_md(lb.strip)
avr_md = get_md()
begin
lb=file.gets()
@@ -77,33 +94,54 @@ 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)
- putc((a==b)?'*':'!')
+ 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
end
-
+ return errors
end
-if ARGV.size < 5
+if ARGV.size < 6
STDERR.print < 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);
+$sp.read_timeout=1000; # 5 minutes
+$sp.flow_control = SerialPort::SOFT
+$algo_select = ARGV[4]
#irb
init_system()
-for i in (4..(ARGV.size-1))
- run_test(ARGV[i])
- puts("")
+for i in (5..(ARGV.size-1))
+ errors = run_test(ARGV[i])
+ if errors == 0
+ puts("\n[ok]")
+ else
+ puts("\n[errors: "+errors.to_s+"]")
+ end
end
+ $sp.print("EXIT\r");
#exit(0);