>From 900821e938d2d37a6f657a9c74ef77010be53f0b Mon Sep 17 00:00:00 2001
From: Frank Dittrich <frank_dittrich@hotmail.com>
Date: Fri, 22 Jun 2012 21:01:36 +0200
Subject: [PATCH] relbench: map old and new format names

---
 run/relbench |   76 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 76 insertions(+), 0 deletions(-)

diff --git a/run/relbench b/run/relbench
index cb98cab..833c0a8 100755
--- a/run/relbench
+++ b/run/relbench
@@ -62,6 +62,10 @@ sub parse
 			$name =~ s/\s+/ /g;
 			$name =~ s/\[/(/;
 			$name =~ s/\]/)/;
+
+			if (defined($renamed{$name})) {
+				$name = $renamed{$name};
+			}
 		}
 		$ok = defined($name);
 	}
@@ -74,6 +78,22 @@ open(B1, '<' . $ARGV[0]) || die "Could not open file: $ARGV[0] ($!)";
 open(B2, '<' . $ARGV[1]) || die "Could not open file: $ARGV[1] ($!)";
 
 $_ = '';
+
+while(<DATA>) {
+	chomp;
+	($old_format, $new_format) = /^(.*)	(.*)$/;
+	if(defined($new_format) && defined($old_format)) {
+		# FIXME: Should I check that no format name appears
+		#        both as an old name and as a new name?
+		#        I don't want to map
+		#        old -> new -> even newer
+		#        or old -> new and new -> old
+		$renamed{$old_format} = $new_format;
+	}
+}
+
+$_ = '';
+
 parse();
 while (<B1>) {
 	parse();
@@ -163,3 +183,59 @@ printf "Median absolute deviation:\t%.5f real, %.5f virtual\n", $madr, $madv;
 
 printf "Geometric mean:\t\t\t%.5f real, %.5f virtual\n", $mr, $mv;
 printf "Geometric standard deviation:\t%.5f real, %.5f virtual\n", $dr, $dv;
+
+# Mapping old format names to new ones, separated by \t
+# old	new
+# Currently not mapped john-1.7.9-jumbo-5 format names:
+#
+# HMAC MD5	HMAC MD5
+# format name unchanged, but benchmark changed from Raw: to
+# Only one salt: / Many salts:
+#
+# MYSQL	MySQL
+# 2 different versions for john-1.7.9-jumbo-5, for next jumbo
+# the MYSQL_fast survived as MySQL, the MYSQL got moved to unused
+#
+# NT	NT (label nt)
+# format name not yet changed
+#
+# NT v2	NT (label nt2)
+# format name not yet changed
+#
+#
+# ssh	SSH RSA/DSA
+# test vector has changed: (one 2048-bit RSA and one 1024-bit DSA key)
+#
+# For readability, please keep this list sorted by old format name
+__DATA__
+DIGEST-MD5	DIGEST-MD5 C/R
+EPiServer SID Hashes	EPiServer SID salted SHA-1
+Eggdrop	Eggdrop Blowfish
+HTTP Digest access authentication	HTTP Digest access authentication MD5
+IPB2 MD5	Invision Power Board 2.x salted MD5
+Kerberos v4 TGT	Kerberos v4 TGT DES
+Kerberos v5 TGT	Kerberos v5 TGT 3DES
+Lotus5	Lotus Notes/Domino 5
+M$ Cache Hash	M$ Cache Hash MD4
+M$ Cache Hash 2 (DCC2)	M$ Cache Hash 2 (DCC2) PBKDF2-HMAC-SHA-1
+MS Kerberos 5 AS-REQ Pre-Auth	MS Kerberos 5 AS-REQ Pre-Auth MD4 MD5 RC4
+MS-SQL	MS SQL SHA-1
+MS-SQL05	MS SQL 2005 SHA-1
+MYSQL_fast	MySQL
+MediaWiki -- md5($s.'-'.md5($p))	MediaWiki md5($s.'-'.md5($p))
+More Secure Internet Password	Lotus Notes/Domino 6 More Secure Internet Password
+Netscape LDAP SHA	Netscape LDAP SHA-1
+Oracle	Oracle 10 DES
+Oracle 11g	Oracle 11g SHA-1
+PHPS -- md5(md5($pass).$salt)	PHPS md5(md5($pass).$salt)
+PHPass MD5	phpass MD5 ($P$9)
+Raw SHA	Raw SHA-0
+SAP BCODE	SAP CODVN B (BCODE)
+SAP CODVN G (PASSCODE)	SAP CODVN F/G (PASSCODE)
+generic crypt(3)	generic crypt(3) DES
+hmailserver	hMailServer salted SHA-256
+pdf	PDF MD5 RC4
+pkzip	PKZIP
+rar	RAR3 SHA-1 AES (4 characters)
+sybasease	Sybase ASE salted SHA-256
+zip	WinZip PBKDF2-HMAC-SHA-1
-- 
1.7.7.6