X-Git-Url: https://git.cryptolib.org/?p=avr-crypto-lib.git;a=blobdiff_plain;f=host%2Fbigint_test.rb;h=032ae9e3cf1f4bee7e38eac6781dfc854b0922bf;hp=df16e7d54f084392ee3b52761410a75c3a5e6f1f;hb=4b5da1dc27a791b5c448274a3db09cd035b33493;hpb=8fcc61325708d1e3b90e7b23135b9a1ab206d115 diff --git a/host/bigint_test.rb b/host/bigint_test.rb index df16e7d..032ae9e 100644 --- a/host/bigint_test.rb +++ b/host/bigint_test.rb @@ -2,7 +2,7 @@ # bigint_test.rb =begin This file is part of the AVR-Crypto-Lib. - Copyright (C) 2008, 2009 Daniel Otte (daniel.otte@rub.de) + Copyright (C) 2006-2015 Daniel Otte (bg@nerilex.org) 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 @@ -23,7 +23,7 @@ $debug = false require 'rubygems' require 'serialport' require 'getopt/std' -require 'ftools' +require 'fileutils' require 'date' $buffer_size = 0 $conffile_check = Hash.new @@ -37,7 +37,7 @@ def readconfigfile(fname, conf) return conf if $conffile_check[fname]==1 $conffile_check[fname]=1 section = "default" - if not File.exists?(fname) + if ! File.exists?(fname) return conf end file = File.open(fname, "r") @@ -49,7 +49,7 @@ def readconfigfile(fname, conf) conf[m[1]] = Hash.new next end - next if not /=/.match(line) + next if ! /=/.match(line) m=/[\s]*([^\s]*)[\s]*=[\s]*([^\s]*)/.match(line) if m[1]=="include" Dir.glob(m[2]){ |fn| conf = readconfigfile(fn, conf) } @@ -80,6 +80,7 @@ end ################################################################################ def gcdext(x,y) + return [0, 0, 0] if(x == 0 || y == 0) g=1 while(x&1==0 && y&1==0) do x>>=1 @@ -127,6 +128,9 @@ end ################################################################################ def init_system(test_prog) + begin + line = $sp.gets() + end while line!=nil $sp.print("echo off \r") print("DBG i: " + "echo off \r"+"\n") if $debug sleep 0.1 @@ -135,6 +139,29 @@ def init_system(test_prog) sleep 1 end +################################################################################ +# wait_for_prompt # +################################################################################ + +def wait_for_prompt(prompt) + prompt = /[\s]*#{prompt}[\s]*/ if(prompt.class == String) + start_time = Time.now.to_i + acc = '' + begin + line = $sp.gets() + puts("DBG got (#{__LINE__}): "+line) if $debug && line + line = "" if line==nil + if /^(Error:|Crypto-VS).*/.match(line) + puts line + return false + end + if (Time.now.to_i- start_time) > $max_timeout + return false + end + acc += line + end while ! m=prompt.match(acc) + return m +end ################################################################################ # screen_progress # @@ -145,7 +172,7 @@ def screen_progress(v) end putc((v)?('*'):('!')) $testno += 1 - $linepos = ($linepos+1)%$linewidth + $linepos = ($linepos+1) % $linewidth end ################################################################################ @@ -161,7 +188,7 @@ def add_test(a,b) puts line return false end - end while not /[\s]*enter a:[\s]*/.match(line) + end while ! /[\s]*enter a:[\s]*/.match(line) $sp.print(a.to_s(16)+" ") begin line = $sp.gets() @@ -171,7 +198,7 @@ def add_test(a,b) puts line return false end - end while not /[\s]*enter b:[\s]*/.match(line) + end while ! /[\s]*enter b:[\s]*/.match(line) $sp.print(b.to_s(16)+" ") begin line = $sp.gets() @@ -181,7 +208,7 @@ def add_test(a,b) puts line return false end - end while not m=/[\s]*([-]?[0-9a-fA-F]*)[\s]+\+[\s]+([+-]?[0-9a-fA-F]*)[\s]*=[\s]*([+-]?[0-9a-fA-F]*)/.match(line) + end while ! m=/[\s]*([-]?[0-9a-fA-F]*)[\s]+\+[\s]+([+-]?[0-9a-fA-F]*)[\s]*=[\s]*([+-]?[0-9a-fA-F]*)/.match(line) a_ = m[1].to_i(16) b_ = m[2].to_i(16) c_ = m[3].to_i(16) @@ -210,7 +237,7 @@ def mul_test(a,b) puts line return false end - end while not /[\s]*enter a:[\s]*/.match(line) + end while ! /[\s]*enter a:[\s]*/.match(line) $sp.print(a.to_s(16)+" ") begin line = $sp.gets() @@ -220,7 +247,7 @@ def mul_test(a,b) puts line return false end - end while not /[\s]*enter b:[\s]*/.match(line) + end while ! /[\s]*enter b:[\s]*/.match(line) $sp.print(b.to_s(16)+" ") begin line = $sp.gets() @@ -230,7 +257,7 @@ def mul_test(a,b) puts line return false end - end while not m=/[\s]*([+-]?[0-9a-fA-F]*)[\s]+\*[\s]+([+-]?[0-9a-fA-F]*)[\s]*=[\s]*([+-]?[0-9a-fA-F]*)/.match(line) + end while ! m=/[\s]*([+-]?[0-9a-fA-F]*)[\s]+\*[\s]+([+-]?[0-9a-fA-F]*)[\s]*=[\s]*([+-]?[0-9a-fA-F]*)/.match(line) a_ = m[1].to_i(16) b_ = m[2].to_i(16) c_ = m[3].to_i(16) @@ -249,59 +276,42 @@ end ################################################################################ # add_scale_test # ################################################################################ +def add_scale_test_dummy(a, b, scale) + should = a + (b<<(8*scale)) + printf("[dummy] %s + %s <<8*%04x = %s\n",a.to_s(16), b.to_s(16), scale, should.to_s(16)) +end def add_scale_test(a, b, scale) - begin - line = $sp.gets() - line = "" if line==nil - puts("DBG got (#{__LINE__}): "+line) if $debug - if /^Error:.*/.match(line) - puts line - return false - end - end while not /[\s]*enter a:[\s]*/.match(line) + m = wait_for_prompt("enter a:") + return false if !m puts("DBG put (#{__LINE__}): "+a.to_s(16)+" ") if $debug $sp.print(a.to_s(16)+" ") - begin - line = $sp.gets() - line = "" if line==nil - puts("DBG got (#{__LINE__}): "+line) if $debug - if /^Error:.*/.match(line) - puts line - return false - end - end while not /[\s]*enter b:[\s]*/.match(line) + m = wait_for_prompt("enter b:") + return false if !m + puts("DBG put (#{__LINE__}): "+b.to_s(16)+" ") if $debug $sp.print(b.to_s(16)+" ") - begin - line = $sp.gets() - line = "" if line==nil - puts("DBG got (#{__LINE__}): "+line) if $debug - if /^Error:.*/.match(line) - puts line - return false - end - end while not /[\s]*enter scale:[\s]*/.match(line) + m = wait_for_prompt("enter scale:") + return false if !m + puts("DBG put (#{__LINE__}): "+scale.to_s(10)+" ") if $debug $sp.print(scale.to_s(10)+"\r") - begin - line = $sp.gets() - line = "" if line==nil - puts("DBG got (#{__LINE__}): "+line) if $debug - if /^Error:.*/.match(line) - puts line - return false - end - end while not m=/[\s]*([-]?[0-9a-fA-F]*)[\s]+\+[\s]+([+-]?[0-9a-fA-F]*)[\s]*<<8\*[\s]*([+-]?[0-9a-fA-F]*)[\s]*=[\s]*([+-]?[0-9a-fA-F]*)/.match(line) + should = a + (b<<(8*scale)) + m = wait_for_prompt(/[\s]*([-]?[0-9a-fA-F]+)[\s]+\+[\s]+([+-]?[0-9a-fA-F]+)[\s]*<<8\*[\s]*([+-]?[0-9a-fA-F]+)[\s]*=[\s]*([+-]?[0-9a-fA-F]+)/) + if !m + $logfile.printf("[fail (CRASH)]:") + $logfile.printf(" ; should %s + %s << 8*%s = %s\n", a.to_s(16), b.to_s(16), scale.to_s(16), should.to_s(16)) + return false + end + line = m[0] a_ = m[1].to_i(16) b_ = m[2].to_i(16) s_ = m[3].to_i(16) c_ = m[4].to_i(16) line.chomp! - should = a + (b<<(8*scale)) if(a_== a && b_ == b && s_ == scale && c_ == should ) $logfile.printf("[pass]: %s\n", line) return true else - $logfile.printf("[fail (%s%s%s)]: %s", (a==a_)?"":"a", (b==b_)?"":"b", (scale==s_)?"":"s",(c_==should)?"":"c",line) + $logfile.printf("[fail (%s%s%s%s)]: %s", (a==a_)?"":"a", (b==b_)?"":"b", (scale==s_)?"":"s",(c_==should)?"":"c",line) $logfile.printf(" ; should %s + %s << 8*%s = %s\n", a.to_s(16), b.to_s(16), scale.to_s(16), should.to_s(16)) return false end @@ -321,7 +331,7 @@ def square_test(a) puts line return false end - end while not /[\s]*enter a:[\s]*/.match(line) + end while ! /[\s]*enter a:[\s]*/.match(line) $sp.print(a.to_s(16)+" ") begin line = $sp.gets() @@ -331,7 +341,7 @@ def square_test(a) puts line return false end - end while not m=/[\s]*([+-]?[0-9a-fA-F]*)[\s]*\*\*2[\s]*=[\s]*([+-]?[0-9a-fA-F]*)/.match(line) + end while ! m=/[\s]*([+-]?[0-9a-fA-F]*)[\s]*\*\*2[\s]*=[\s]*([+-]?[0-9a-fA-F]*)/.match(line) a_ = m[1].to_i(16) c_ = m[2].to_i(16) line.chomp! @@ -359,7 +369,7 @@ def reduce_test(a,b) puts line return false end - end while not /[\s]*enter a:[\s]*/.match(line) + end while ! /[\s]*enter a:[\s]*/.match(line) $sp.print(a.to_s(16)+" ") begin line = $sp.gets() @@ -369,7 +379,7 @@ def reduce_test(a,b) puts line return false end - end while not /[\s]*enter b:[\s]*/.match(line) + end while ! /[\s]*enter b:[\s]*/.match(line) $sp.print(b.to_s(16)+" ") line='' begin @@ -381,7 +391,7 @@ def reduce_test(a,b) puts line return false end - end while not m=/[\s]*([+-]?[0-9a-fA-F]*)[\s]+%[\s]+([+-]?[0-9a-fA-F]*)[\s]*=[\s]*([+-]?[0-9a-fA-F]+)/.match(line) + end while ! m=/[\s]*([+-]?[0-9a-fA-F]*)[\s]+%[\s]+([+-]?[0-9a-fA-F]*)[\s]*=[\s]*([+-]?[0-9a-fA-F]+)/.match(line) a_ = m[1].to_i(16) b_ = m[2].to_i(16) c_ = m[3].to_i(16) @@ -398,11 +408,12 @@ def reduce_test(a,b) end ################################################################################ -# expmod_test # +# mulmod_test # ################################################################################ -def expmod_test(a,b,c) +def mulmod_test(a,b,c) begin + printf("[testing] mulmod(%#x, %#x, %#x)\n",a,b,c) if $debug line = $sp.gets() line = "" if line==nil puts("DBG got: "+line) if $debug @@ -410,7 +421,7 @@ def expmod_test(a,b,c) puts line return false end - end while not /[\s]*enter a:[\s]*/.match(line) + end while ! /[\s]*enter a:[\s]*/.match(line) $sp.print(a.to_s(16)+" ") begin line = $sp.gets() @@ -420,7 +431,7 @@ def expmod_test(a,b,c) puts line return false end - end while not /[\s]*enter b:[\s]*/.match(line) + end while ! /[\s]*enter b:[\s]*/.match(line) $sp.print(b.to_s(16)+" ") begin line = $sp.gets() @@ -430,7 +441,7 @@ def expmod_test(a,b,c) puts line return false end - end while not /[\s]*enter c:[\s]*/.match(line) + end while ! /[\s]*enter c:[\s]*/.match(line) $sp.print(c.to_s(16)+" ") line='' begin @@ -442,7 +453,72 @@ def expmod_test(a,b,c) puts line return false end - end while not m=/[\s]*([+-]?[0-9a-fA-F]*)\*\*([+-]?[0-9a-fA-F]*)[\s]+%[\s]+([+-]?[0-9a-fA-F]*)[\s]*=[\s]*([+-]?[0-9a-fA-F]+)/.match(line) + m = /[\s]*\([\s]*([+-]?[0-9a-fA-F]*)[\s]*\*[\s]*([+-]?[0-9a-fA-F]*)[\s]*\)[\s]+%[\s]+([+-]?[0-9a-fA-F]*)[\s]*=[\s]*([+-]?[0-9a-fA-F]+)/.match(line) + puts("DBG: line did not match pattern (" + line + ")") if !m && $debug + end while ! m + a_ = m[1].to_i(16) + b_ = m[2].to_i(16) + c_ = m[3].to_i(16) + d_ = m[4].to_i(16) + line.chomp! + if(a_== a && b_ == b && c_ == c && d_ == (a * b % c) ) + $logfile.printf("[pass]: %s\n", line) + return true + else + $logfile.printf("[fail (%s%s%s%s)]: %s", (a == a_) ? '' : 'a', (b == b_) ? '' : 'b', (c_ == c) ? '' : 'c', (d_== (a * b % c)) ? '' : 'd',line) + $logfile.printf(" ; should (%s * %s) %% %s = %s\n", a.to_s(16), b.to_s(16), c.to_s(16), (a * b % c).to_s(16)) + return false + end + return false +end + +################################################################################ +# expmod_test # +################################################################################ + +def expmod_test(a,b,c) + begin + printf("[testing] expmod(%#x, %#x, %#x)\n",a,b,c) if $debug + line = $sp.gets() + line = "" if line==nil + puts("DBG got: "+line) if $debug + if /^Error:.*/.match(line) + puts line + return false + end + end while ! /[\s]*enter a:[\s]*/.match(line) + $sp.print(a.to_s(16)+" ") + begin + line = $sp.gets() + line = "" if line==nil + puts("DBG got: "+line) if $debug + if /^Error:.*/.match(line) + puts line + return false + end + end while ! /[\s]*enter b:[\s]*/.match(line) + $sp.print(b.to_s(16)+" ") + begin + line = $sp.gets() + line = "" if line==nil + puts("DBG got: "+line) if $debug + if /^Error:.*/.match(line) + puts line + return false + end + end while ! /[\s]*enter c:[\s]*/.match(line) + $sp.print(c.to_s(16)+" ") + line='' + begin + line_tmp = $sp.gets() + line_tmp = '' if line_tmp == nil + line += line_tmp + puts("DBG got: "+line) if $debug + if /^Error:/.match(line) + puts line + return false + end + end while ! m=/[\s]*([+-]?[0-9a-fA-F]+)\*\*([+-]?[0-9a-fA-F]+)[\s]+%[\s]+([+-]?[0-9a-fA-F]+)[\s]*=[\s]*([+-]?[0-9a-fA-F]+)/.match(line) a_ = m[1].to_i(16) b_ = m[2].to_i(16) c_ = m[3].to_i(16) @@ -464,6 +540,7 @@ end ################################################################################ def gcdext_test(a,b) + $logfile.printf("[testing] gcdext(%s, %s)\n", a.to_s(16), b.to_s(16)) begin line = $sp.gets() line = "" if line==nil @@ -472,7 +549,7 @@ def gcdext_test(a,b) puts line return false end - end while not /[\s]*enter a:[\s]*/.match(line) + end while ! /[\s]*enter a:[\s]*/.match(line) $sp.print(a.to_s(16)+" ") begin line = $sp.gets() @@ -482,7 +559,7 @@ def gcdext_test(a,b) puts line return false end - end while not /[\s]*enter b:[\s]*/.match(line) + end while ! /[\s]*enter b:[\s]*/.match(line) $sp.print(b.to_s(16)+" ") line='' begin @@ -495,7 +572,7 @@ def gcdext_test(a,b) puts line return false end - end while not m=/gcdext\([\s]*([+-]?[0-9a-fA-F]*)[\s]*,[\s]*([+-]?[0-9a-fA-F]*)[\s]*\)[\s]*=> a = ([+-]?[0-9a-fA-F]+); b = ([+-]?[0-9a-fA-F]+); gcd = ([+-]?[0-9a-fA-F]+)/.match(line) + end while ! m=/gcdext\([\s]*([+-]?[0-9a-fA-F]*)[\s]*,[\s]*([+-]?[0-9a-fA-F]*)[\s]*\)[\s]*=> a = ([+-]?[0-9a-fA-F]+); b = ([+-]?[0-9a-fA-F]+); gcd = ([+-]?[0-9a-fA-F]+)/.match(line) a_ = m[1].to_i(16) b_ = m[2].to_i(16) c_ = m[3].to_i(16) @@ -563,7 +640,7 @@ def run_test_add_scale(skip=0) length_b_B = skip+1 begin $size = length_a_B - (0..16).each do |i| + (0..4).each do |i| scales = [0, 300] 16.times { scales << rand(301) } scales.sort! @@ -576,12 +653,12 @@ def run_test_add_scale(skip=0) screen_progress(v) end end - (0..16).each do |i| + (0..4).each do |i| scales = [0, 300] 16.times { scales << rand(301) } scales.sort! scales.each do |scale| - b_size = rand(length_b_B+1) + b_size = rand(length_b_B+1)+1 a = rand(256**length_a_B) b = rand(256**b_size) v = add_scale_test(a, b, scale) @@ -595,6 +672,39 @@ def run_test_add_scale(skip=0) end while length_a_B<4096/8 end +def run_test_add_scale_dummy(skip=0) + length_a_B = skip+1 + length_b_B = skip+1 + begin + $size = length_a_B + (0..4).each do |i| + scales = [0, 300] + 16.times { scales << rand(301) } + scales.sort! + scales.each do |scale| + a = rand(256**length_a_B) + b = rand(256**length_a_B) + v = add_scale_test_dummy(a, b, scale) + v = add_scale_test_dummy(b, a, scale) + end + end + (0..4).each do |i| + scales = [0, 300] + 16.times { scales << rand(301) } + scales.sort! + scales.each do |scale| + b_size = rand(length_b_B+1) + a = rand(256**length_a_B) + b = rand(256**b_size) + v = add_scale_test_dummy(a, b, scale) + v = add_scale_test_dummy(b, a, scale) + end + end + length_a_B += 10 + length_b_B += 10 + end while length_a_B<4096/8 +end + ################################################################################ # run_test_mul # ################################################################################ @@ -630,6 +740,24 @@ def run_test_mul(skip=0) end while length_a_B<4096/8 end +################################################################################ +# run_test_mul_word # +################################################################################ + +def run_test_mul_word(skip=0) + length_a_B = skip+1 + length_b_B = skip+1 + begin + $size = length_a_B + (0..255).each do |i| + a = rand(256 ** length_a_B) + v = mul_test(a, i) + screen_progress(v) + end + length_a_B += 1 + end while length_a_B < 4096 / 8 +end + ################################################################################ # run_test_square # ################################################################################ @@ -679,6 +807,66 @@ end ################################################################################ def run_test_expmod(skip=0) + length_a_B = skip + 1 + length_b_B = skip + 1 + length_c_B = skip + 1 + begin + $size = length_a_B + (0..16).each do |i| + a = rand(256 ** length_a_B) + b = rand(256 ** length_b_B) + 1 + c = rand(256 ** length_c_B) + 1 + v = expmod_test(a, b, c) + screen_progress(v) + end + (0..16).each do |i| + b_size = rand(length_b_B+1) + a = rand(256 ** length_a_B) + b = rand(256 ** b_size) + 1 + c = rand(256 ** b_size) + 1 + v = expmod_test(a, b, c) + screen_progress(v) + end + length_a_B += 1 + length_b_B += 1 + end while length_a_B<4096/8 +end + +################################################################################ +# run_test_expmodmont # +################################################################################ + +def run_test_expmodmont(skip=0) + length_a_B = skip + 1 + length_b_B = skip + 1 + length_c_B = skip + 1 + begin + $size = length_a_B + (0..16).each do |i| + a = rand(256 ** length_a_B) + b = rand(256 ** length_b_B) + 1 + c = rand(256 ** length_c_B) / 2 * 2 +1 + v = expmod_test(a, b, c) + screen_progress(v) + end + (0..16).each do |i| + b_size = rand(length_b_B + 10) + a = rand(256 ** length_a_B) + b = rand(256 ** b_size) + 1 + c = rand(256 ** b_size) / 2 * 2 +1 + v = expmod_test(a, b, c) + screen_progress(v) + end + length_a_B += 1 + length_b_B += 1 + end while length_a_B<4096/8 +end + +################################################################################ +# run_test_mulmod # +################################################################################ + +def run_test_mulmod(skip=0) length_a_B = skip+1 length_b_B = skip+1 length_c_B = skip+1 @@ -686,21 +874,26 @@ def run_test_expmod(skip=0) $size = length_a_B (0..16).each do |i| a = rand(256**length_a_B) - b = rand(256**length_b_B)+1 - c = rand(256**length_c_B)+1 - v = expmod_test(a, b, c) + b = rand(256**length_b_B) + c = (rand(256**length_c_B) / 2 * 2) + 1 + a %= c + b %= c + v = mulmod_test(a, b, c) screen_progress(v) end (0..16).each do |i| b_size = rand(length_b_B+1) a = rand(256**length_a_B) - b = rand(256**b_size)+1 - c = rand(256**b_size)+1 - v = expmod_test(a, b, c) + b = rand(256**b_size) + c = (rand(256**length_c_B) / 2 * 2) + 1 + a %= c + b %= c + v = mulmod_test(a, b, c) screen_progress(v) end length_a_B += 1 length_b_B += 1 + length_c_B += 1 end while length_a_B<4096/8 end @@ -733,6 +926,36 @@ def run_test_gcdext(skip=0) end while length_a_B<4096/8 end +def init_serialport(conf) + puts("serial port interface version: " + SerialPort::VERSION); + $linewidth = 64 + $linepos = 0 + $testno = 0 + params = { "baud" => conf["PORT"]["baud"].to_i, + "data_bits" => conf["PORT"]["databits"].to_i, + "stop_bits" => conf["PORT"]["stopbits"].to_i, + "parity" => SerialPort::NONE } + params["paraty"] = SerialPort::ODD if conf["PORT"]["paraty"].downcase == "odd" + params["paraty"] = SerialPort::EVEN if conf["PORT"]["paraty"].downcase == "even" + params["paraty"] = SerialPort::MARK if conf["PORT"]["paraty"].downcase == "mark" + params["paraty"] = SerialPort::SPACE if conf["PORT"]["paraty"].downcase == "space" + + puts("\nPort: "+conf["PORT"]["port"]+"@" + + params["baud"].to_s + + " " + + params["data_bits"].to_s + + conf["PORT"]["paraty"][0,1].upcase + + params["stop_bits"].to_s + + "\n") + + $sp = SerialPort.new(conf["PORT"]["port"], params) + + $sp.read_timeout=1000; # 5 minutes + $sp.flow_control = SerialPort::SOFT + + reset_system() +end + ################################################################################ # MAIN # ################################################################################ @@ -746,34 +969,9 @@ conf = readconfigfile("testport.conf", conf) conf = readconfigfile(opts["f"], conf) if opts["f"] #puts conf.inspect +init_serialport(conf) -puts("serial port interface version: " + SerialPort::VERSION); -$linewidth = 64 -$linepos = 0 -$testno = 0 -params = { "baud" => conf["PORT"]["baud"].to_i, - "data_bits" => conf["PORT"]["databits"].to_i, - "stop_bits" => conf["PORT"]["stopbits"].to_i, - "parity" => SerialPort::NONE } -params["paraty"] = SerialPort::ODD if conf["PORT"]["paraty"].downcase == "odd" -params["paraty"] = SerialPort::EVEN if conf["PORT"]["paraty"].downcase == "even" -params["paraty"] = SerialPort::MARK if conf["PORT"]["paraty"].downcase == "mark" -params["paraty"] = SerialPort::SPACE if conf["PORT"]["paraty"].downcase == "space" - -puts("\nPort: "+conf["PORT"]["port"]+"@" + - params["baud"].to_s + - " " + - params["data_bits"].to_s + - conf["PORT"]["paraty"][0,1].upcase + - params["stop_bits"].to_s + - "\n") - -$sp = SerialPort.new(conf["PORT"]["port"], params) - -$sp.read_timeout=1000; # 5 minutes -$sp.flow_control = SerialPort::SOFT - -reset_system() + $max_timeout = 5 * 60 if opts['d'] $debug = true @@ -787,17 +985,21 @@ if File.exists?(logfilename) i+=1 end while(File.exists?(logfilename)) while(i>2) do - File.move(sprintf('%s%04d%s', conf['PORT']['testlogbase']+'bigint_',i-2,'.txt'), - sprintf('%s%04d%s', conf['PORT']['testlogbase']+'bigint_',i-1,'.txt'), true) + n1 = sprintf('%s%04d%s', conf['PORT']['testlogbase']+'bigint_',i-2,'.txt') + n2 = sprintf('%s%04d%s', conf['PORT']['testlogbase']+'bigint_',i-1,'.txt') + File.rename(n1, n2) +# printf("%s -> %s\n", n1, n2) i-=1 end - File.move(sprintf('%s%s', conf['PORT']['testlogbase'],'bigint.txt'), - sprintf('%s%04d%s', conf['PORT']['testlogbase']+'bigint_',1,'.txt'), true) + n1 = sprintf('%s%s', conf['PORT']['testlogbase'],'bigint.txt') + n2 = sprintf('%s%04d%s', conf['PORT']['testlogbase']+'bigint_',1,'.txt') + File.rename(n1, n2) + printf("%s -> %s\n", n1, n2) logfilename = conf['PORT']['testlogbase']+'bigint.txt' end $logfile = File.open(logfilename, 'w') printf("logfile: %s\n", logfilename) - +$logfile.sync = true $logfile.printf("bigint test from: %s\n", Time.now.to_s) $logfile.printf("skip = %s\n", opts['s']) if opts['s'] $logfile.printf("seed = 0x%X\n", 0xdeadbeef) @@ -805,18 +1007,24 @@ $logfile.printf("seed = 0x%X\n", 0xdeadbeef) tests = Hash.new tests['a'] = proc {|x| run_test_add(x) } tests['m'] = proc {|x| run_test_mul(x) } +tests['M'] = proc {|x| run_test_mulmod(x) } +tests['n'] = proc {|x| run_test_mul_word(x) } tests['x'] = proc {|x| run_test_add_scale(x) } tests['s'] = proc {|x| run_test_square(x) } tests['r'] = proc {|x| run_test_reduce(x) } tests['e'] = proc {|x| run_test_expmod(x) } +tests['E'] = proc {|x| run_test_expmodmont(x) } tests['g'] = proc {|x| run_test_gcdext(x) } init_str = Hash.new init_str['a'] = 'add-test' init_str['x'] = 'add-scale-test' init_str['m'] = 'mul-test' +init_str['M'] = 'mul-mont-test' +init_str['n'] = 'mul-word-test' init_str['s'] = 'square-test' init_str['r'] = 'reduce-test' init_str['e'] = 'expmod-test' +init_str['E'] = 'expmod-mont-test' init_str['g'] = 'gcdext-test' srand(0xdeadbeef) @@ -832,7 +1040,7 @@ if opts['a'] end end else - 'amsre'.each_char do |x| + 'amsrMeE'.each_char do |x| if tests[x] puts init_str[x] init_system(init_str[x]) @@ -842,6 +1050,6 @@ else end end end - +1 $logile.close()