adding mickey128

[arm-crypto-lib.git] / host / get_test.rb

diff --git a/host/get_test.rb b/host/get_test.rb
index 337ef3f4034bf7caf974e4f8cc314ee137b0a9be..d14d632d3ead615e4dd0e9a83e6faf17f98db784 100644 (file)
--- a/host/get_test.rb
+++ b/host/get_test.rb
@@ -1,7 +1,7 @@
 #!/usr/bin/ruby 
 # get_test.rb
 =begin
-    This file is part of the AVR-Crypto-Lib.
+    This file is part of the ARM-Crypto-Lib.
     Copyright (C) 2008, 2009  Daniel Otte (daniel.otte@rub.de)
 
     This program is free software: you can redistribute it and/or modify
@@ -18,6 +18,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 =end
 
+require 'rubygems'
 require 'serialport'
 
 def read_line(error_msg=true)
@@ -26,7 +27,7 @@ def read_line(error_msg=true)
     puts("ERROR: read timeout!\n") if error_msg
        return nil
   end  
-  s.gsub(/\006/, '');  
+  return s.delete("\006");     
 end
 
 def readTestVector(param)
@@ -76,7 +77,7 @@ def readTestVector(param)
        set=m[1].to_i;
        print("\nSet "+m[1]+":");
       end
-      if (m=/Set [0-9]*, vector#[\s]*([0-9]+):/.match(lb))
+      if (m=/Set [0-9], vector#[\s]*([0-9]+):/.match(lb))
         vector=m[1].to_i;
        #print(" "+m[1]);
        if(vector!=0 && vector % $linewidth==0)
@@ -111,7 +112,7 @@ param=(ARGV.size>=7)?ARGV[6]:"";
 puts("\nPort: "+ARGV[0]+ "@"+ARGV[1]+" "+ARGV[2]+"N"+ARGV[3]+"\n");
 $linewidth = 16
 $sp = SerialPort.new(ARGV[0], ARGV[1].to_i, ARGV[2].to_i, ARGV[3].to_i, SerialPort::NONE);
-$sp.read_timeout=1000; # 1 secound
+$sp.read_timeout=10000; # 1 secound
 $extended_wait=100;
 $sp.write(command);