From c27f813900a3c114562efbb8df1065e94766fc48 Mon Sep 17 00:00:00 2001 From: The Android Open Source Project Date: Tue, 10 Feb 2009 15:43:59 -0800 Subject: auto import from //branches/cupcake/...@130745 --- aes.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'aes.c') diff --git a/aes.c b/aes.c index cd4484f..3700894 100644 --- a/aes.c +++ b/aes.c @@ -1,5 +1,5 @@ /** - * + * * aes.c - integrated in QEMU by Fabrice Bellard from the OpenSSL project. */ /* @@ -27,10 +27,13 @@ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "vl.h" +#include "qemu-common.h" #include "aes.h" +#ifndef NDEBUG #define NDEBUG +#endif + #include typedef uint32_t u32; @@ -1267,7 +1270,7 @@ void AES_decrypt(const unsigned char *in, unsigned char *out, void AES_cbc_encrypt(const unsigned char *in, unsigned char *out, const unsigned long length, const AES_KEY *key, - unsigned char *ivec, const int enc) + unsigned char *ivec, const int enc) { unsigned long n; @@ -1294,7 +1297,7 @@ void AES_cbc_encrypt(const unsigned char *in, unsigned char *out, AES_encrypt(tmp, tmp, key); memcpy(out, tmp, AES_BLOCK_SIZE); memcpy(ivec, tmp, AES_BLOCK_SIZE); - } + } } else { while (len >= AES_BLOCK_SIZE) { memcpy(tmp, in, AES_BLOCK_SIZE); @@ -1312,6 +1315,6 @@ void AES_cbc_encrypt(const unsigned char *in, unsigned char *out, for(n=0; n < len; ++n) out[n] = tmp[n] ^ ivec[n]; memcpy(ivec, tmp, AES_BLOCK_SIZE); - } + } } } -- cgit v1.1