[PATCH] s3: improve the code in the AES encryption.