Switched to using an HMAC to salt blocks.

Suggested by Joshua Datko