diff options
| author | Matt Caswell <matt@openssl.org> | 2023-02-03 17:03:09 +0000 |
|---|---|---|
| committer | Pauli <pauli@openssl.org> | 2023-02-24 10:58:19 +1100 |
| commit | 2c4b1c7b7b09c0e3f9f4246e8d6747678ea90363 (patch) | |
| tree | e823a2b2b6b6e6a2a9ac7d4b4d78a17f73cd9239 | |
| parent | 89ed54456ec79bfc3c2f8c5e216efb5976a07525 (diff) | |
Do not have more data in a pipeline than the split_send_fragment
We shouldn't be putting more data into a pipeline than the value of
split_send_fragment.
This is a backport of a fix which was included in a much larger commit in
master (c6186792b98) related to moving the pipelining code into the new
record layer that exists there.
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Hugo Landau <hlandau@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/20208)
| -rw-r--r-- | ssl/record/rec_layer_s3.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/ssl/record/rec_layer_s3.c b/ssl/record/rec_layer_s3.c index edcedbe04c..ad01c6050b 100644 --- a/ssl/record/rec_layer_s3.c +++ b/ssl/record/rec_layer_s3.c @@ -608,14 +608,13 @@ int ssl3_write_bytes(SSL *s, int type, const void *buf_, size_t len, if (numpipes > maxpipes) numpipes = maxpipes; - if (n / numpipes >= max_send_fragment) { + if (n / numpipes >= split_send_fragment) { /* * We have enough data to completely fill all available * pipelines */ - for (j = 0; j < numpipes; j++) { - pipelens[j] = max_send_fragment; - } + for (j = 0; j < numpipes; j++) + pipelens[j] = split_send_fragment; } else { /* We can partially fill all available pipelines */ tmppipelen = n / numpipes; |