fix for large file encrypt/decrypt streams
merge
corrected all tests to support new key types