Merge branch 'master' of github.com:wolfSSL/wolfssl

This commit is contained in:
kaleb-himes
2015-07-16 15:15:55 -06:00
2 changed files with 2 additions and 1 deletions

View File

@@ -4912,7 +4912,7 @@ static int ecc_get_key_sizes(ecEncCtx* ctx, int* encKeySz, int* ivSz,
switch (ctx->encAlgo) { switch (ctx->encAlgo) {
case ecAES_128_CBC: case ecAES_128_CBC:
*encKeySz = KEY_SIZE_128; *encKeySz = KEY_SIZE_128;
*ivSz = IV_SIZE_64; *ivSz = IV_SIZE_128;
*blockSz = AES_BLOCK_SIZE; *blockSz = AES_BLOCK_SIZE;
break; break;
default: default:

View File

@@ -231,6 +231,7 @@ enum {
KEY_SIZE_128 = 16, KEY_SIZE_128 = 16,
KEY_SIZE_256 = 32, KEY_SIZE_256 = 32,
IV_SIZE_64 = 8, IV_SIZE_64 = 8,
IV_SIZE_128 = 16,
EXCHANGE_SALT_SZ = 16, EXCHANGE_SALT_SZ = 16,
EXCHANGE_INFO_SZ = 23 EXCHANGE_INFO_SZ = 23
}; };