Merge pull request #323

Confidentiality and integrity limits for AEAD