Update john.conf to bleeding edge.

dotfiles/john/john.conf

@@ -104,8 +104,10 @@ TimeFormat24 = %H:%M:%S
 # Default is N
 #IgnoreChmodErrors = N
 
-# Set this to N to disable use of memory-mapping in wordlist mode.
+# This figure is in MB. The default is to memory map wordlists not larger
-WordlistMemoryMap = Y
+# than one terabyte.
+# Set this to 0 to disable any use of memory-mapping in wordlist mode.
+WordlistMemoryMapMaxSize = 1048576
 
 # For single mode, load the full GECOS field (before splitting) as one
 # additional candidate. Normal behavior is to only load individual words
@@ -216,6 +218,12 @@ UnicodeStoreUTF8 = Y
 # This is needed e.g. for --loopback to crack LM->NT including non-ASCII.
 CPstoreUTF8 = Y
 
+# Normally, we try to handle Unicode characters not in our selected codepage
+# with best effort. Enabling this option will instead translate any such
+# character to "?" (default), to meet certain formats' behavior.
+EmulateBrokenEncoding = N
+ReplacementCharacter = ?
+
 # Default verbosity is 3, valid figures are 1-5 right now.
 # 4-5 enables some extra output and diagnostics.
 # 4 is same verbosity as "john proper" aka. non-jumbo.
@@ -266,6 +274,11 @@ ShowUIDinCracks = N
 # a negative number means UNLIMITED grace time - never hard abort.
 AbortGraceTime = 30
 
+# Setting this to true allows SAP-B and SAP-G "half hashes" to be cracked.
+# These are taken from RFC_READ_TABLE and padded with nulls to correct length.
+# This may produce some false positives if enabled, at least for SAP-B.
+SAPhalfHashes = N
+
 # This allows you to list a few words/names that will be used by single mode
 # as if they were included in every GECOS field.  Use sparingly! Please note
 # that the example words are commented out, so the list is empty!
@@ -284,6 +297,19 @@ AbortGraceTime = 30
 #somedirectory
 #$JOHN/my.pot
 
+[Options:CPUtune]
+# If preset is given, use it and skip autotune (NOTE: non-intel archs will
+# currently ignore this option and always autotune)
+UsePreset = Y
+# Performance sample time, default 10 ms
+AutoTuneSampleTime = 10
+# Required gain to consider this scale better. Default is 1 %
+AutoTuneReqGain = 1
+# Max crypt_all() duration for trying a higher scale, default 100 ms
+AutoTuneMaxDuration = 100
+# If we tried this many increases of scale w/o gain, give up. Default 3.
+AutoTuneMaxNoProgress = 3
+
 [Options:MPI]
 # Automagically disable OMP if MPI is used (set to N if
 # you want to run one MPI process per multi-core host)
@@ -316,6 +342,64 @@ FanStatus = N
 AbortTemperature = 95
 
 
+# ZTEX specific settings
+[ZTEX:descrypt]
+# The design has two programmable clocks. The 1st one is supplied to
+# pipelines of DES rounds, the 2nd clock is supplied to comparators.
+# Startup frequencies are 220,160.
+#Frequency = 220,160
+
+[ZTEX:bcrypt]
+# Define typical setting of hashes it's going to process. It allows
+# to adjust for best performance.
+TargetSetting = 6
+# Startup frequency for bcrypt-ztex is 140. Design tools guaranteed
+# 141.5 in worst-case temperature and voltage.
+Frequency = 141
+# It's possible to set frequency on per-board and per-fpga basis.
+#Frequency_04A36E0FD6 = 142
+#Frequency_04A36E0FD6_0 = 143
+#Frequency_04A36E0FD6_3 = 144
+
+[ZTEX:sha512crypt]
+#TargetRounds = 5000
+# Design tools reported possible frequency to be 215 MHz.
+# We never encountered a board where this worked anywhere close
+# to such high frequency. Default frequency is set to 160 MHz.
+# Some lucky boards might run at some higher frequency.
+Frequency = 160
+#Config1 = \x00\x00
+
+[ZTEX:Drupal7]
+#TargetRounds = 16384
+# Drupal7 uses same bitstream as sha512crypt, see comment regarding
+# default frequency in sha512crypt section.
+#Frequency = 160
+# Some bitstreams accept runtime configuration.
+# In sha512crypt/Drupal7, configuration is 2 bytes. That's interpreted
+# as a bitmask. By setting any of the lowest 10 bits to 1 it turns off
+# corresponding unit (there are 10 units in the bitstream).
+# This turns off units 0 and 1.
+#Config1 = \x03\x00
+# This turns off all 10 units (resulting in a timeout).
+#Config1_04A36E0FD6_0 = \xff\x03
+
+[ZTEX:sha256crypt]
+# Design tools reported possible frequency is 166.3 but tested boards
+# miss guesses, often fail unless frequency is decreased.
+#Frequency = 165
+Frequency = 135
+#TargetRounds = 1000000
+
+# md5crypt and phpass use same bitstream. Design tools reported
+# possible frequency is 202 MHz. Tested boards run OK at 180 MHz.
+[ZTEX:md5crypt]
+Frequency = 180
+
+[ZTEX:phpass]
+Frequency = 180
+#TargetRounds = 2048
+
 [Options:OpenCL]
 # Set default OpenCL device. Command line option will override this.
 # If not set, we will search for a GPU or fall-back to the most
@@ -348,6 +432,7 @@ GlobalBuildOpts = -cl-mad-enable
 # Any other value (eg. 64) will be taken verbatim.
 AutotuneLWS = 1
 
+
 # Format-specific settings:
 
 # Uncomment the below for nvidia sm_30 and beyond.
@@ -464,15 +549,16 @@ DefaultHybridMask = ?w?d?d?d?d
 8 =
 9 =
 
-# these are user defined character sets.  There purpose is to allow custom salt
+# These are user defined character sets.  Their purpose is to allow custom salt
 # values to be used within the salt_regen logic.  These will be the characters
 # to use for this character within the salt.  So if we had a salt that was 4
-# characters, and 0-9a-m, we can easily do this by 0 = [0-9a-m]  If this is used,
+# characters, and 0-9a-m, we can easily do this by 0 = [0-9a-m].  If this is
-# the regen salt value would be ?0?0?0?0 and salts such as a47m 2kd5 would be valid.
+# used, the regen salt value would be ?0?0?0?0 and salts such as a47m 2kd5
+# would be valid.
 [Regen_Salts_UserClasses]
 1 = [1-9]
 
-# A "no rules" rule for super fast Single mode (use with --single=none)
+# A "no rules" rule for eg. super-fast Single mode (use with --single=none)
 [List.Rules:None]
 :
 
@@ -821,6 +907,10 @@ i[0-9A-Z][ -~]
 o[0-9A-E][ -~] Q M o[0-9A-E][ -~] Q
 i[0-9A-E][ -~] i[0-9A-E][ -~]
 
+[List.Rules:T9]
+/?D l sa2 sb2 sc2 sd3 se3 sf3 sg4 sh4 si4 sj5 sk5 sl5 sm6 sn6 so6 sp7 sq7 sr7 ss7 st8 su8 sv8 sw9 sx9 sy9 sz9 s?D*
+/?D l sa2 sb2 sc2 sd3 se3 sf3 sg4 sh4 si4 sj5 sk5 sl5 sm6 sn6 so6 sp7 sq7 sr7 ss7 st8 su8 sv8 sw9 sx9 sy9 sz9 /?D s?D#
+
 # Default Loopback mode rules.
 [List.Rules:Loopback]
 .include [List.Rules:NT]
@@ -832,6 +922,12 @@ i[0-9A-E][ -~] i[0-9A-E][ -~]
 .include [List.Rules:Extra]
 .include [List.Rules:OldOffice]
 
+# "Best64" rules
+[List.Rules:best64]
+!! hashcat logic ON
+.include <best64.conf>
+!! hashcat logic OFF
+
 # For Wordlist mode and very fast hashes
 [List.Rules:Jumbo]
 .include [List.Rules:Wordlist]
@@ -839,9 +935,7 @@ i[0-9A-E][ -~] i[0-9A-E][ -~]
 .include [List.Rules:Extra]
 .include [List.Rules:NT]
 .include [List.Rules:OldOffice]
-
+.include [List.Rules:best64]
-# "Best64" rules
-.include <best64.conf>
 
 # KoreLogic rules
 .include <korelogic.conf>
@@ -852,6 +946,7 @@ i[0-9A-E][ -~] i[0-9A-E][ -~]
 .include [List.Rules:Jumbo]
 .include [List.Rules:best64]
 .include [List.Rules:KoreLogic]
+.include [List.Rules:T9]
 
 # Incremental modes