wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Adjust in and in_len instead of donelen

Browse source 
Don't use the temp variable donelen in the non-aad fragmented code path.

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2275)
This commit is contained in:
Matt Caswell 2017-01-25 09:26:35 +00:00
parent 7141ba3196
commit ef055ec536
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
test/evp_test.c
View file

@ -1012,7 +1012,6 @@ static int cipher_test_enc(struct evp_test *t, int enc,
EVP_CIPHER_CTX_set_padding(ctx, 0);
err = "CIPHERUPDATE_ERROR";
tmplen = 0;
donelen = 0;
if (!frag) {
/* We supply the data all in one go */
if (!EVP_CipherUpdate(ctx, tmp + out_misalign, &tmplen, in, in_len))
@ -1023,18 +1022,20 @@ static int cipher_test_enc(struct evp_test *t, int enc,
if (!EVP_CipherUpdate(ctx, tmp + out_misalign, &chunklen, in, 1))
goto err;
tmplen += chunklen;
donelen = 1;
in++;
in_len--;
}
if (in_len > 2) {
if (in_len > 1) {
if (!EVP_CipherUpdate(ctx, tmp + out_misalign + tmplen, &chunklen,
in + donelen, in_len - 2))
in, in_len - 1))
goto err;
tmplen += chunklen;
donelen += in_len - 2;
in += in_len - 1;
in_len = 1;
}
if (in_len > 1 ) {
if (in_len > 0 ) {
if (!EVP_CipherUpdate(ctx, tmp + out_misalign + tmplen, &chunklen,
in + donelen, 1))
in, 1))
goto err;
tmplen += chunklen;
}