Add solution for 2.10
Rework AES logic to use the lower-level API instead of EVP.