Refactor to prepare for CCM decryption
3 files changed