diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2017-02-03 02:49:26 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2017-02-08 02:16:27 +0000 |
| commit | 00212c6662b52f20e7ecdf17901c02f388bfd98d (patch) | |
| tree | 11d57707dc48bc382ef88fe531f54a928ee35ce3 /test | |
| parent | 197421b120396a16588a8d9d969fe75908ea9d2e (diff) | |
Call EVP_CipherFinal in CCM mode for tests.
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2550)
Diffstat (limited to 'test')
| -rw-r--r-- | test/evp_test.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/test/evp_test.c b/test/evp_test.c index 2f651b6dce..494a46b318 100644 --- a/test/evp_test.c +++ b/test/evp_test.c @@ -1040,13 +1040,9 @@ static int cipher_test_enc(struct evp_test *t, int enc, tmplen += chunklen; } } - if (cdat->aead == EVP_CIPH_CCM_MODE) - tmpflen = 0; - else { - err = "CIPHERFINAL_ERROR"; - if (!EVP_CipherFinal_ex(ctx, tmp + out_misalign + tmplen, &tmpflen)) - goto err; - } + err = "CIPHERFINAL_ERROR"; + if (!EVP_CipherFinal_ex(ctx, tmp + out_misalign + tmplen, &tmpflen)) + goto err; err = "LENGTH_MISMATCH"; if (out_len != (size_t)(tmplen + tmpflen)) goto err; |