Here are a couple more fixes
DMG debug bugfix (duh!), and a new test that seems pretty generic.
dmg2john error message.
dmg2john: Temporary fixes to handle large files and iteration count.
DMG: Support iteration count. DMG-opencl: A bunch of fixes. This format
was not up to par with CPU format. Serious flaws fixed. Add a known plain
test for 8 consecutive nulls.
PoC optimization for NTLMv1. Maintain a table for the third DES block.

Conflicts:
	src/NETNTLM_fmt_plug.c
SIMD support for NTLMv1 and OMP tweaks for non-SIMD.
(cherry picked from commit f3c6622be4054faf8992112c4c5101d5731baff1)

Conflicts:
	src/NETNTLM_fmt_plug.c
Merge Solar's 2nd version of NETNTLM patch.
(cherry picked from commit 6ab65c5, manually merged from ea46591)

Conflicts:
	src/NETNTLM_fmt_plug.c
NTLMv1: Very effective hint to the optimiser in cmp_all(). And benchmark
using crippled plaintexts, so we measure real-life performance.
NT2: Bugfixes to experimental OMP support (defaults to disabled).
(cherry picked from commit 884e277d25b7ae441ea1f1ee5aee335fd412ae47)
DMG formats: Disable all but the NULL test, but bump that one to 16.
(cherry picked from commit 17b2c582debddf2ee482c18516e9d03cdbae8901)
DMG: Re-enable the other plaintext checks (but not Apple).
(cherry picked from commit 5d47bdc00ac037456f53369099c860e1397946c4)
DMG: properly re-enable plain checks, for OpenCL too.
(cherry picked from commit 7be93725d5b8b0ad9ac6a42735ce16fa5ad334a6)
Try to speedup cmp_all() by use of a bitmap.  This only makes sense when
cmp_all() is called multiple times per crypt_all()'s actual processing -
that is, when cracking two or more C/R pairs at once.  There's a check
for that in the code.  Moreover, use of the bitmap is automatically
disabled when the C/R pair count reduces to 1.

(cherry picked from commit 8373b846307da8e9073ab009e1557bc172277fb2)

Conflicts:
	src/NETNTLM_fmt_plug.c
NTLMv1: Bugfix, and compact the hash functions (before merging the new stuff to
mschapv2)
MSCHAPv2: SIMD support and exploitation of weakness just like NTLMv1 (the
formats are very similar)
NTLMv1 and MSCHAPv2: reject hashes in valid() as hinted by Solar.
Implement ldr_sort_salts(), currently hard-coded to only apply to wpapsk
formats. In the future we will probably want a format struct entry for
format->methods.salt_compare().
Bugfix for Jim's patch. Some debug functions were not static, and they
were included several times for GPU builds so the compiler bailed. Also
wrap that debug stuff in WPAPSK_DEBUG.
MSCHAPv2, NTLMv1: After the 3rd DES block check in valid(), cache the
indexes so we don't have to loop again in binary().