Changed AES encryption to use EVP interface