ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[NUC472/M487] Fix AES alter. CFB128 error

pull/4925/head
ccli8 2017-09-27 10:19:46 +08:00
parent 7076675fec
commit 289bbf0ec7
2 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
features/mbedtls/targets/TARGET_NUVOTON/TARGET_M480/aes/aes_alt.c
View File

@ -343,31 +343,31 @@ int mbedtls_aes_crypt_cfb128( mbedtls_aes_context *ctx,
ctx->encDec = 1; ctx->encDec = 1;
} }
while (block_chain_len) {
size_t block_chain_len2 = (block_chain_len > MAX_DMA_CHAIN_SIZE) ? MAX_DMA_CHAIN_SIZE : block_chain_len;
/* Fetch IV byte data in big-endian */ /* Fetch IV byte data in big-endian */
ctx->iv[0] = nu_get32_be(iv); ctx->iv[0] = nu_get32_be(iv);
ctx->iv[1] = nu_get32_be(iv + 4); ctx->iv[1] = nu_get32_be(iv + 4);
ctx->iv[2] = nu_get32_be(iv + 8); ctx->iv[2] = nu_get32_be(iv + 8);
ctx->iv[3] = nu_get32_be(iv + 12); ctx->iv[3] = nu_get32_be(iv + 12);
while (block_chain_len) {
size_t block_chain_len2 = (block_chain_len > MAX_DMA_CHAIN_SIZE) ? MAX_DMA_CHAIN_SIZE : block_chain_len;
__nvt_aes_crypt(ctx, input, output, block_chain_len2); __nvt_aes_crypt(ctx, input, output, block_chain_len2);
input += block_chain_len2; input += block_chain_len2;
output += block_chain_len2; output += block_chain_len2;
length -= block_chain_len2; length -= block_chain_len2;
block_chain_len -= block_chain_len2;
}
/* NOTE: Buffers input/output could overlap. See ctx->iv rather than input/output /* NOTE: Buffers input/output could overlap. See ctx->iv rather than input/output
* for iv of next block cipher. */ * for iv of next block cipher. */
/* Fetch IV byte data in big-endian */ /* Fetch IV byte data in big-endian */
ctx->iv[0] = nu_get32_be(iv); nu_set32_be(iv, ctx->iv[0]);
ctx->iv[1] = nu_get32_be(iv + 4); nu_set32_be(iv + 4, ctx->iv[1]);
ctx->iv[2] = nu_get32_be(iv + 8); nu_set32_be(iv + 8, ctx->iv[2]);
ctx->iv[3] = nu_get32_be(iv + 12); nu_set32_be(iv + 12, ctx->iv[3]);
block_chain_len -= block_chain_len2;
}
} }
/* Last incomplete block */ /* Last incomplete block */

20
features/mbedtls/targets/TARGET_NUVOTON/TARGET_NUC472/aes/aes_alt.c
View File

@ -343,31 +343,31 @@ int mbedtls_aes_crypt_cfb128( mbedtls_aes_context *ctx,
ctx->encDec = 1; ctx->encDec = 1;
} }
while (block_chain_len) {
size_t block_chain_len2 = (block_chain_len > MAX_DMA_CHAIN_SIZE) ? MAX_DMA_CHAIN_SIZE : block_chain_len;
/* Fetch IV byte data in big-endian */ /* Fetch IV byte data in big-endian */
ctx->iv[0] = nu_get32_be(iv); ctx->iv[0] = nu_get32_be(iv);
ctx->iv[1] = nu_get32_be(iv + 4); ctx->iv[1] = nu_get32_be(iv + 4);
ctx->iv[2] = nu_get32_be(iv + 8); ctx->iv[2] = nu_get32_be(iv + 8);
ctx->iv[3] = nu_get32_be(iv + 12); ctx->iv[3] = nu_get32_be(iv + 12);
while (block_chain_len) {
size_t block_chain_len2 = (block_chain_len > MAX_DMA_CHAIN_SIZE) ? MAX_DMA_CHAIN_SIZE : block_chain_len;
__nvt_aes_crypt(ctx, input, output, block_chain_len2); __nvt_aes_crypt(ctx, input, output, block_chain_len2);
input += block_chain_len2; input += block_chain_len2;
output += block_chain_len2; output += block_chain_len2;
length -= block_chain_len2; length -= block_chain_len2;
block_chain_len -= block_chain_len2;
}
/* NOTE: Buffers input/output could overlap. See ctx->iv rather than input/output /* NOTE: Buffers input/output could overlap. See ctx->iv rather than input/output
* for iv of next block cipher. */ * for iv of next block cipher. */
/* Fetch IV byte data in big-endian */ /* Fetch IV byte data in big-endian */
ctx->iv[0] = nu_get32_be(iv); nu_set32_be(iv, ctx->iv[0]);
ctx->iv[1] = nu_get32_be(iv + 4); nu_set32_be(iv + 4, ctx->iv[1]);
ctx->iv[2] = nu_get32_be(iv + 8); nu_set32_be(iv + 8, ctx->iv[2]);
ctx->iv[3] = nu_get32_be(iv + 12); nu_set32_be(iv + 12, ctx->iv[3]);
block_chain_len -= block_chain_len2;
}
} }
/* Last incomplete block */ /* Last incomplete block */