A few more changes for encryption.  Add test that encrypted file can be read.
5 files changed