wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-31 11:17:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix setting outlen with wolfSSL_EVP_CipherUpdate decryption

Browse Source
This commit is contained in:
Jacob Barthelmeh
2019-02-26 15:27:25 -07:00
parent 8b0bcdaf29
commit b33023df2f
2 changed files with 82 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
wolfcrypt/src/evp.c
View File

@ -361,9 +361,13 @@ WOLFSSL_API int wolfSSL_EVP_CipherUpdate(WOLFSSL_EVP_CIPHER_CTX *ctx,
XMEMCPY(ctx->lastBlock, &out[ctx->block_size * blocks], ctx->block_size); XMEMCPY(ctx->lastBlock, &out[ctx->block_size * blocks], ctx->block_size);
*outl+= ctx->block_size * blocks; *outl+= ctx->block_size * blocks;
} else { } else {
ctx->lastUsed = 1; if (inl == 0) {
XMEMCPY(ctx->lastBlock, &out[ctx->block_size * (blocks-1)], ctx->block_size); ctx->lastUsed = 1;
*outl+= ctx->block_size * (blocks-1); blocks = blocks - 1; /* save last block to check padding in
* EVP_CipherFinal call */
}
XMEMCPY(ctx->lastBlock, &out[ctx->block_size * blocks], ctx->block_size);
*outl+= ctx->block_size * blocks;
} }
} else { } else {
*outl+= ctx->block_size * blocks; *outl+= ctx->block_size * blocks;

81
wolfcrypt/test/test.c
View File

@ -12665,6 +12665,75 @@ static int openssl_aes_test(void)
if (XMEMCMP(plain, cbcPlain, 18)) if (XMEMCMP(plain, cbcPlain, 18))
return -7315; return -7315;
/* test with encrypting/decrypting more than 16 bytes at once */
total = 0;
EVP_CIPHER_CTX_init(&en);
if (EVP_CipherInit(&en, EVP_aes_128_cbc(),
(unsigned char*)key, (unsigned char*)iv, 1) == 0)
return -7316;
if (EVP_CipherUpdate(&en, (byte*)cipher, &outlen,
(byte*)cbcPlain, 17) == 0)
return -7317;
if (outlen != 16)
return -7318;
total += outlen;
if (EVP_CipherUpdate(&en, (byte*)&cipher[total], &outlen,
(byte*)&cbcPlain[17] , 1) == 0)
return -7319;
if (outlen != 0)
return -7320;
total += outlen;
if (EVP_CipherFinal(&en, (byte*)&cipher[total], &outlen) == 0)
return -7321;
if (outlen != 16)
return -7322;
total += outlen;
if (total != 32)
return -7323;
total = 0;
EVP_CIPHER_CTX_init(&de);
if (EVP_CipherInit(&de, EVP_aes_128_cbc(),
(unsigned char*)key, (unsigned char*)iv, 0) == 0)
return -7324;
if (EVP_CipherUpdate(&de, (byte*)plain, &outlen, (byte*)cipher, 17) == 0)
return -7325;
if (outlen != 16)
return -7326;
total += outlen;
/* final call on non block size should fail */
if (EVP_CipherFinal(&de, (byte*)&plain[total], &outlen) != 0)
return -7327;
if (EVP_CipherUpdate(&de, (byte*)&plain[total], &outlen,
(byte*)&cipher[17], 1) == 0)
return -7328;
if (outlen != 0)
total += outlen;
if (EVP_CipherUpdate(&de, (byte*)&plain[total], &outlen,
(byte*)&cipher[17+1], 14) == 0)
return -7329;
if (outlen != 0)
return -7330;
total += outlen;
if (EVP_CipherFinal(&de, (byte*)&plain[total], &outlen) == 0)
return -7331;
if (outlen != 2)
return -7332;
total += outlen;
if (total != 18)
return -7333;
if (XMEMCMP(plain, cbcPlain, 18))
return -7334;
} }
{ /* evp_cipher test: EVP_aes_128_cbc */ { /* evp_cipher test: EVP_aes_128_cbc */
@ -12690,23 +12759,23 @@ static int openssl_aes_test(void)
EVP_CIPHER_CTX_init(&ctx); EVP_CIPHER_CTX_init(&ctx);
if (EVP_CipherInit(&ctx, EVP_aes_128_cbc(), key, iv, 1) == 0) if (EVP_CipherInit(&ctx, EVP_aes_128_cbc(), key, iv, 1) == 0)
return -7316; return -7335;
if (EVP_Cipher(&ctx, cipher, (byte*)msg, 16) == 0) if (EVP_Cipher(&ctx, cipher, (byte*)msg, 16) == 0)
return -7317; return -7336;
if (XMEMCMP(cipher, verify, AES_BLOCK_SIZE)) if (XMEMCMP(cipher, verify, AES_BLOCK_SIZE))
return -7318; return -7337;
EVP_CIPHER_CTX_init(&ctx); EVP_CIPHER_CTX_init(&ctx);
if (EVP_CipherInit(&ctx, EVP_aes_128_cbc(), key, iv, 0) == 0) if (EVP_CipherInit(&ctx, EVP_aes_128_cbc(), key, iv, 0) == 0)
return -7319; return -7338;
if (EVP_Cipher(&ctx, plain, cipher, 16) == 0) if (EVP_Cipher(&ctx, plain, cipher, 16) == 0)
return -7320; return -7339;
if (XMEMCMP(plain, msg, AES_BLOCK_SIZE)) if (XMEMCMP(plain, msg, AES_BLOCK_SIZE))
return -7321; return -7340;
} /* end evp_cipher test: EVP_aes_128_cbc*/ } /* end evp_cipher test: EVP_aes_128_cbc*/