mirrors/wolfssl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change evp with cfb1 expect input size in bytes

Browse Source
This commit is contained in:
Jacob Barthelmeh 2020-02-12 17:45:09 -07:00 committed by Eric Blankenhorn
parent 1a96558b6e
commit a0ddb05a07
3 changed files with 70 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wolfcrypt/src/aes.c
View File

@ -7607,7 +7607,7 @@ static int wc_AesFeedbackCFB1(Aes* aes, byte* out, const byte* in,
}
}
if (bit > 0) {
if (bit > 0 && bit < 7) {
out[0] = cur;
}
@ -7621,7 +7621,7 @@ static int wc_AesFeedbackCFB1(Aes* aes, byte* out, const byte* in,
* out buffer to hold result of encryption (must be at least as large as input
* buffer)
* in buffer to encrypt (packed to left, i.e. 101 is 0x90)
* sz size of input buffer
* sz size of input buffer in bits (0x1 would be size of 1 and 0xFF size of 8)
*
* returns 0 on success and negative values on failure
*/
@ -7653,7 +7653,7 @@ int wc_AesCfb8Encrypt(Aes* aes, byte* out, const byte* in, word32 sz)
* out buffer to hold result of encryption (must be at least as large as input
* buffer)
* in buffer to encrypt
* sz size of input buffer
* sz size of input buffer in bits (0x1 would be size of 1 and 0xFF size of 8)
*
* returns 0 on success and negative values on failure
*/

6
wolfcrypt/src/evp.c
View File

@ -363,9 +363,11 @@ static int evpCipherBlock(WOLFSSL_EVP_CIPHER_CTX *ctx,
case AES_192_CFB1_TYPE:
case AES_256_CFB1_TYPE:
if (ctx->enc)
ret = wc_AesCfb1Encrypt(&ctx->cipher.aes, out, in, inl);
ret = wc_AesCfb1Encrypt(&ctx->cipher.aes, out, in,
inl * WOLFSSL_BIT_SIZE);
else
ret = wc_AesCfb1Decrypt(&ctx->cipher.aes, out, in, inl);
ret = wc_AesCfb1Decrypt(&ctx->cipher.aes, out, in,
inl * WOLFSSL_BIT_SIZE);
break;
case AES_128_CFB8_TYPE:

73
wolfcrypt/test/test.c
View File

@ -6378,13 +6378,6 @@ EVP_TEST_END:
#ifdef WOLFSSL_AES_128
/* 128 key tests */
#ifdef OPENSSL_EXTRA
ret = EVP_test(EVP_aes_128_cfb1(), key1, iv, msg1, sizeof(msg1),
cipher1, 2);
if (ret != 0) {
return ret;
}
#endif
ret = wc_AesSetKey(&enc, key1, AES_BLOCK_SIZE, iv, AES_ENCRYPTION);
if (ret != 0)
return -4741;
@ -6411,6 +6404,24 @@ EVP_TEST_END:
if (plain[0] != msg1[0])
return -4746;
#endif /* HAVE_AES_DECRYPT */
#ifdef OPENSSL_EXTRA
ret = wc_AesSetKey(&enc, key1, AES_BLOCK_SIZE, iv, AES_ENCRYPTION);
if (ret != 0)
return -4747;
XMEMSET(cipher, 0, sizeof(cipher));
ret = wc_AesCfb1Encrypt(&enc, cipher, msg1,
sizeof(msg1) * WOLFSSL_BIT_SIZE);
if (ret != 0)
return -4748;
ret = EVP_test(EVP_aes_128_cfb1(), key1, iv, msg1, sizeof(msg1),
cipher, sizeof(msg1));
if (ret != 0) {
return ret;
}
#endif
#endif /* WOLFSSL_AES_128 */
#ifdef WOLFSSL_AES_192
/* 192 key tests */
@ -6435,9 +6446,30 @@ EVP_TEST_END:
#ifdef WOLFSSL_AES_192
/* 192 key tests */
ret = wc_AesSetKey(&enc, key2, sizeof(key2), iv2, AES_ENCRYPTION);
if (ret != 0)
return -4749;
XMEMSET(cipher, 0, sizeof(cipher));
ret = wc_AesCfb1Encrypt(&enc, cipher, msg2, 4);
if (ret != 0)
return -4750;
if (XMEMCMP(cipher, cipher2, sizeof(cipher2)) != 0)
return -4751;
#ifdef OPENSSL_EXTRA
ret = wc_AesSetKey(&enc, key2, sizeof(key2), iv2, AES_ENCRYPTION);
if (ret != 0)
return -4752;
XMEMSET(cipher, 0, sizeof(cipher));
ret = wc_AesCfb1Encrypt(&enc, cipher, msg2,
sizeof(msg2) * WOLFSSL_BIT_SIZE);
if (ret != 0)
return -4753;
ret = EVP_test(EVP_aes_192_cfb1(), key2, iv2, msg2, sizeof(msg2),
cipher2, 4);
cipher, sizeof(msg2));
if (ret != 0) {
return ret;
}
@ -6446,14 +6478,35 @@ EVP_TEST_END:
#ifdef WOLFSSL_AES_256
/* 256 key tests */
ret = wc_AesSetKey(&enc, key3, sizeof(key3), iv3, AES_ENCRYPTION);
if (ret != 0)
return -4754;
XMEMSET(cipher, 0, sizeof(cipher));
ret = wc_AesCfb1Encrypt(&enc, cipher, msg3, 10);
if (ret != 0)
return -4755;
if (XMEMCMP(cipher, cipher3, sizeof(cipher3)) != 0)
return -4756;
#ifdef OPENSSL_EXTRA
ret = wc_AesSetKey(&enc, key3, sizeof(key3), iv3, AES_ENCRYPTION);
if (ret != 0)
return -4757;
XMEMSET(cipher, 0, sizeof(cipher));
ret = wc_AesCfb1Encrypt(&enc, cipher, msg3,
sizeof(msg3) * WOLFSSL_BIT_SIZE);
if (ret != 0)
return -4758;
ret = EVP_test(EVP_aes_256_cfb1(), key3, iv3, msg3, sizeof(msg3),
cipher3, 10);
cipher, sizeof(msg3));
if (ret != 0) {
return ret;
}
#endif
#endif /* WOLFSSL_AES_192 */
#endif /* WOLFSSL_AES_256 */
return ret;
}