Adding patches for encrypt:
* Make encrypt module use the encrypt key
* Trim only the decrypted output from encryption