diff options
| author | Matt Caswell <matt@openssl.org> | 2017-01-24 12:57:34 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2017-01-25 15:07:36 +0000 |
| commit | 3258e29a385f4800440a96a16889035a83aff437 (patch) | |
| tree | 3b2cffadaf2483b9f8d7fa96e9db2314aea60210 /test/evp_test.c | |
| parent | fd18736a6b970c9b772f9c1b3cda4adcd20c63e2 (diff) | |
Fix the overlapping check for fragmented "Update" operations
When doing in place encryption the overlapping buffer check can fail
incorrectly where we have done a partial block "Update" operation. This
fixes things to take account of any pending partial blocks.
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2275)
(cherry picked from commit 7141ba31969d0b378d08104a51f8f99b9187b9d5)
Diffstat (limited to 'test/evp_test.c')
| -rw-r--r-- | test/evp_test.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/test/evp_test.c b/test/evp_test.c index f6f1b729f8..3a7205bc2f 100644 --- a/test/evp_test.c +++ b/test/evp_test.c @@ -1101,9 +1101,6 @@ static int cipher_test_run(struct evp_test *t) static char aux_err[64]; t->aux_err = aux_err; for (inp_misalign = (size_t)-1; inp_misalign != 2; inp_misalign++) { - if (frag && inp_misalign == (size_t)-1) - continue; - if (inp_misalign == (size_t)-1) { /* kludge: inp_misalign == -1 means "exercise in-place" */ BIO_snprintf(aux_err, sizeof(aux_err), |