Incorrect constants: s/BOXZERO/ZERO/
s/BOXZERO/ZERO/
Reduced redundant code, added new crypto test
Merge pull request #464 from slvr/crypto-fix

Incorrect constants: s/BOXZERO/ZERO/