add jtr updates

rapid7 · Apr 3, 2020 · e1e694e · e1e694e
1 parent cbff9a8
commit e1e694e
Show file tree

Hide file tree

Showing 4 changed files with 1,301 additions and 1,226 deletions.
diff --git a/data/jtr/dumb16.conf b/data/jtr/dumb16.conf
@@ -36,9 +36,6 @@ void init()
 	else
 		maxlength = 2;
 
-	# UTF-8 representation is up to 3x the character length
-	if (maxlength * 3 > cipher_limit)
-		maxlength = (cipher_limit + 2) / 3;
 /*
  * This defines the character set. This is auto-generated from UnicodeData.txt
  * and we skip control characters.

diff --git a/data/jtr/dumb32.conf b/data/jtr/dumb32.conf
@@ -41,9 +41,6 @@ void init()
 	else
 		maxlength = 2;
 
-	# UTF-8 representation is up to 4x the character length
-	if (maxlength * 4 > cipher_limit)
-		maxlength = (cipher_limit + 3) / 4;
 /*
  * This defines the character set. This is auto-generated from UnicodeData.txt
  * and we skip control characters.

diff --git a/data/jtr/dynamic_flat_sse_formats.conf b/data/jtr/dynamic_flat_sse_formats.conf
@@ -92,7 +92,7 @@ Test=$dynamic_2005$e7222e806a8ce5efa6d48acb3aa56dc2$aaaaa:test3
 TestD=$dynamic_2005$ba5528ac65c20213e105bb02e6aaf6a2$1234567890123456789012345678901234567890:12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890
 
 [List.Generic:dynamic_2006]
-Expression=md5(md5($p).$s) (PW > 55 bytes)
+Expression=md5(md5($p).$s) (vBulletin, PW > 55 bytes or/and salt > 23 bytes)
 Flag=MGF_SALTED
 Flag=MGF_KEYS_BASE16_IN1
 Flag=MGF_FLAT_BUFFERS