>From 723694a805fedb1a2deeec1edd3e56c4e0d88022 Mon Sep 17 00:00:00 2001
From: Frank Dittrich <frank_dittrich@hotmail.com>
Date: Mon, 25 Jun 2012 01:50:04 +0200
Subject: [PATCH] benchmark-unify: map "MYSQL" to "MySQL" and "NT v2" to "NT
 MD4"

Otherwise, only the fastest of both benchmarks of newer jumbo revisions
will be compared with the MYSQL_fast implementation, even if for some
reason the MYSQL_fast implementation is slower than the MYSQL one.
Comparing the fastest of two MySQL implementations of an older jumbo
version with the fastest of two MySQL implementations of a new jumbo
version (> john-1.7.9-jumbo-5) is only fair.
And it also gets rid of the "Only in file 1: MYSQL:Raw" output when
running relbench.

The same logic applies to the mapping of NT v2 to MT MD4.
---
 run/benchmark-unify |   13 ++-----------
 1 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/run/benchmark-unify b/run/benchmark-unify
index 2efde14..859d7e2 100755
--- a/run/benchmark-unify
+++ b/run/benchmark-unify
@@ -91,17 +91,6 @@ while (<>) {
 # 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)
 #
@@ -120,9 +109,11 @@ 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	MySQL
 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
+NT v2	NT MD4
 Netscape LDAP SHA	Netscape LDAP SHA-1
 Oracle	Oracle 10 DES
 Oracle 11g	Oracle 11g SHA-1
-- 
1.7.7.6