Include encryption headers & MAC (if present) in bundle contents.
Remove inadvertantly deleted code to add aes-256-gcm headers.
Fix bad string comparison.
Alter PBKDF2 exponent.