>>From 8abf94707513e78a94ef42286c8eaaf9ce76e1ca Mon Sep 17 00:00:00 2001 From: Frank Dittrich Date: Wed, 23 Oct 2013 22:51:54 +0200 Subject: [PATCH 2/3] benchmark-unify: adjustments for dynamic formats Especially commit 197f067 required changes, because dynamic_1350 md5(md5($s.$p):$s); [128/128 SSE2 intrinsics 10x4x3] etc. had to be converted to dynamic_1350 [md5(md5($s.$p):$s); 128/128 SSE2 intrinsics 10x4x3] etc. --- run/benchmark-unify | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/run/benchmark-unify b/run/benchmark-unify index a49716b..febd4ea 100755 --- a/run/benchmark-unify +++ b/run/benchmark-unify @@ -46,13 +46,13 @@ sub parse { chomp; - ($name,$end) = /^Benchmarking: (.*[^ ]) +(\[.*\].*)$/; + # john-1.7.6-jumbo-12 still used md5_gen(n) instead of dynamic_n + s/^Benchmarking: +md5_gen\(([0-9]+)\):? +/Benchmarking: dynamic_$1: /; + s/^(Benchmarking: dynamic_[0-9]+):? ([^[]+)\[/$1 [$2/; + ($name,$end) = /^Benchmarking: ([^\[]*[^ ]) +(\[.*\].*)$/; if (defined($name) && defined($end)) { - $name =~ s/(dynamic_[0-9]+) /$1: /; $name =~ s/\s+/ /g; - $name =~ s/\[/(/; - $name =~ s/\]/)/; - + $end =~ s/\s+/ /g; if (defined($renamed{$name})) { $name = $renamed{$name}; } @@ -99,8 +99,6 @@ while (<>) { __DATA__ bf-opencl, OpenBSD Blowfish (x32) bcrypt-opencl ("$2a$05", 32 iterations) DIGEST-MD5 DIGEST-MD5 C/R -dynamic_20: Cisco PIX (MD5 salted) dynamic_20: Cisco ASA (MD5 salted) -dynamic_38: sha1($s.sha1($s.($p))) (Wolt3BB) dynamic_38: sha1($s.sha1($s.sha1($p))) (Wolt3BB) Eggdrop Eggdrop Blowfish EPiServer SID Hashes EPiServer SID salted SHA-1 FreeBSD MD5 crypt-MD5 -- 1.8.1.4