Moved globally defined constants to class constants
Merge pull request #548 from cnelissen/CryptPackageConstantsFix2

Crypt package constants fix #2

* cnelissen/CryptPackageConstantsFix2:
  Moved globally defined constants to class constants