Merged support for Camellia-GCM + ciphersuite and fixes to cipher layer