Merge branch 'master' of https://github.com/cyassl/cyassl

2014-05-20 13:27:29 -07:00
parent 744590c868 842ff6f24d
commit 0d2471b2f7
3 changed files with 30 additions and 16 deletions
--- a/ctaocrypt/src/aes.c
+++ b/ctaocrypt/src/aes.c
@@ -2241,6 +2241,7 @@ int AesCbcEncrypt(Aes* aes, byte* out, const byte* in, word32 sz)
        if ((word)in % 16) {
        #ifndef NO_CYASSL_ALLOC_ALIGN
            byte* tmp = (byte*)XMALLOC(sz, NULL, DYNAMIC_TYPE_TMP_BUFFER);
+            CYASSL_MSG("AES-CBC encrypt with bad alignment");
            if (tmp == NULL) return MEMORY_E;

            XMEMCPY(tmp, in, sz);