Adjusted to block size
Refactored out Gcrypt