feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Fix for AES-CFB1 encrypt/decrypt on size (8*x-1) bits

Browse Source
This commit is contained in:
Lealem Amedie
2024-04-18 11:31:28 -06:00
parent d1efccd259
commit 295033441c
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wolfcrypt/src/aes.c
View File

@ -11863,7 +11863,7 @@ static WARN_UNUSED_RESULT int wc_AesFeedbackCFB1(
} }
if (ret == 0) { if (ret == 0) {
if (bit > 0 && bit < 7) { if (bit >= 0 && bit < 7) {
out[0] = cur; out[0] = cur;
} }
} }

14
wolfcrypt/test/test.c
View File

@ -9152,6 +9152,11 @@ EVP_TEST_END:
{ {
0xC0 0xC0
}; };
WOLFSSL_SMALL_STACK_STATIC const byte cipher1_7bit[] =
{
0x1C
};
#endif /* WOLFSSL_AES_128 */ #endif /* WOLFSSL_AES_128 */
#ifdef WOLFSSL_AES_192 #ifdef WOLFSSL_AES_192
WOLFSSL_SMALL_STACK_STATIC const byte iv2[] = { WOLFSSL_SMALL_STACK_STATIC const byte iv2[] = {
@ -9252,6 +9257,15 @@ EVP_TEST_END:
ERROR_OUT(WC_TEST_RET_ENC_NC, out); ERROR_OUT(WC_TEST_RET_ENC_NC, out);
#endif /* HAVE_AES_DECRYPT */ #endif /* HAVE_AES_DECRYPT */
XMEMSET(cipher, 0, sizeof(cipher));
ret = wc_AesCfb1Encrypt(enc, cipher, msg1, 7);
if (ret != 0)
ERROR_OUT(WC_TEST_RET_ENC_EC(ret), out);
if (cipher[0] != cipher1_7bit[0])
ERROR_OUT(WC_TEST_RET_ENC_NC, out);
#ifdef OPENSSL_EXTRA #ifdef OPENSSL_EXTRA
ret = wc_AesSetKey(enc, key1, AES_BLOCK_SIZE, iv, AES_ENCRYPTION); ret = wc_AesSetKey(enc, key1, AES_BLOCK_SIZE, iv, AES_ENCRYPTION);
if (ret != 0) if (ret != 0)