Merge pull request #3467 from AndrzejKurek/cipher-wrap-aes-128-optimize

Wrap AES 192 and 256 info structures in an !AES_ONLY_128_BIT_KEY_LENGTH define