summaryrefslogtreecommitdiffstats
path: root/test/evp_test.c
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2017-01-24 12:57:34 +0000
committerMatt Caswell <matt@openssl.org>2017-01-25 15:02:44 +0000
commit7141ba31969d0b378d08104a51f8f99b9187b9d5 (patch)
tree58735ecf1d4e9b266e2b928f13d018d2118f05c3 /test/evp_test.c
parent0b96d77a62d8ac9a45ac1dda47560ced676b5b8d (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)
Diffstat (limited to 'test/evp_test.c')
-rw-r--r--test/evp_test.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/test/evp_test.c b/test/evp_test.c
index cc0a5bd420..f0e8ca35c0 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),