Merge pull request #446 from frank-dittrich/bleeding-jumbo

Bleeding jumbo
Fix a typo in previous merge
dynamic.conf: avoid nested brackets [ [ ] ] in john --test output

There were just 3 dynamic formats using brackets in their
Expression.
This caused john --test output to contain nested brackets.
Nested brackets in john --test output would require more
jumbo specific adjustments in relbench which are not needed
in the core version.

Instead of adjusting relbench, change the dynamic format expressions.

The new output
	sha1(unicode($p)) (Microsoft CREDHIST)
instead of
	sha1(unicode($p)) [Microsoft CREDHIST]
follows the "syntax" used for other dynamic formats:
	md5($p) (raw-md5)
	md5($p.$s) (joomla)
	md5(md5($p)) (e107)
	md5($s.$p) (OSC)
	md5(md5($s).md5($p)) (IPB)
	md5($p.$s) (RADIUS User-Password)
etc.
Add a space in dynamic_18 format name

Changing
	md5($s.Y.$p.0xF7.$s)(Post.Office MD5)
into
	md5($s.Y.$p.0xF7.$s) (Post.Office MD5)

All other formats with algorithm names using multiple expressions
in parentheses have a single space character between the
right parenthesis of the previous expression and the left parenthesis
of the next expression.