fixed a bug involving const nonces for CCM. Added AES-CCM to the full commit test case.

This commit is contained in:
John Safranek 2013-01-15 16:16:48 -08:00
parent ccff37f4b1
commit c7b5fbe552
2 changed files with 2 additions and 2 deletions

View File

@ -23,7 +23,7 @@ RESULT=$?
# make sure full config is ok
echo -e "\n\nTesting full config as well...\n\n"
./configure --enable-opensslExtra --enable-fastmath --enable-dtls --enable-aesgcm --enable-hc128 --enable-sniffer --enable-psk --enable-rabbit;
./configure --enable-opensslExtra --enable-fastmath --enable-dtls --enable-aesgcm --enable-aesccm --enable-hc128 --enable-sniffer --enable-psk --enable-rabbit;
RESULT=$?
[ $RESULT -ne 0 ] && echo -e "\n\nFull config ./configure failed" && exit 1

View File

@ -2658,7 +2658,7 @@ int AesCcmDecrypt(Aes* aes, byte* out, const byte* in, word32 inSz,
o = out;
oSz = inSz;
XMEMCPY(B+1, nonce, AES_BLOCK_SIZE);
XMEMCPY(B+1, nonce, nonceSz);
lenSz = AES_BLOCK_SIZE - 1 - nonceSz;
B[0] = (lenSz - 1);