Merge branch '2020-01-17-improve-aes-support'

- Add support and tests for AES192 and AES256