fixup! Support SSL_OP_CLEANSE_PLAINTEXT on QUIC streams

t8m · Jun 13, 2023 · bb00b49 · bb00b49
1 parent 5c018f0
commit bb00b49
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/ssl/quic/quic_channel.c b/ssl/quic/quic_channel.c
@@ -2384,7 +2384,7 @@ static int ch_init_new_stream(QUIC_CHANNEL *ch, QUIC_STREAM *qs,
  goto err;
  ossl_quic_rstream_set_cleanse(qs->rstream,
  (ch->tls->ctx->options
-  & SSL_OP_CLEANSE_PLAINTEXT) != 0);
+ & SSL_OP_CLEANSE_PLAINTEXT) != 0);
  }
 
  /* TXFC */

diff --git a/ssl/quic/quic_sf_list.c b/ssl/quic/quic_sf_list.c
@@ -22,7 +22,7 @@ static void stream_frame_free(SFRAME_LIST *fl, STREAM_FRAME *sf)
 {
  if (fl->cleanse && sf->data != NULL)
  OPENSSL_cleanse((unsigned char *)sf->data,
- sf->range.end - sf->range.start);
+ (size_t)(sf->range.end - sf->range.start));
  ossl_qrx_pkt_release(sf->pkt);
  OPENSSL_free(sf);
 }
@@ -300,7 +300,7 @@ int ossl_sframe_list_move_data(SFRAME_LIST *fl,
 
  if (fl->cleanse)
  OPENSSL_cleanse((unsigned char *)data,
- sf->range.end - sf->range.start);
+ (size_t)(sf->range.end - sf->range.start));
 
  /* release the packet */
  sf->data = NULL;