summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjsing <>2022-09-11 13:50:41 +0000
committerjsing <>2022-09-11 13:50:41 +0000
commitc79da7df7157a30235d61ba0217edf5ceaea5f53 (patch)
treedffe5174649affd8ab06e8f959b7c7a7f9b97820
parentd285e298bd2f5e4b7ea20f8623d14258b0071d07 (diff)
downloadopenbsd-c79da7df7157a30235d61ba0217edf5ceaea5f53.tar.gz
openbsd-c79da7df7157a30235d61ba0217edf5ceaea5f53.tar.bz2
openbsd-c79da7df7157a30235d61ba0217edf5ceaea5f53.zip
Ensure there is no trailing data for a CCS received by the TLSv1.3 stack.
ok tb@
-rw-r--r--src/lib/libssl/tls13_record_layer.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/libssl/tls13_record_layer.c b/src/lib/libssl/tls13_record_layer.c
index ac5b83bd34..423b405cbd 100644
--- a/src/lib/libssl/tls13_record_layer.c
+++ b/src/lib/libssl/tls13_record_layer.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: tls13_record_layer.c,v 1.70 2022/07/24 14:28:16 jsing Exp $ */ 1/* $OpenBSD: tls13_record_layer.c,v 1.71 2022/09/11 13:50:41 jsing Exp $ */
2/* 2/*
3 * Copyright (c) 2018, 2019 Joel Sing <jsing@openbsd.org> 3 * Copyright (c) 2018, 2019 Joel Sing <jsing@openbsd.org>
4 * 4 *
@@ -850,6 +850,8 @@ tls13_record_layer_read_record(struct tls13_record_layer *rl)
850 return tls13_send_alert(rl, TLS13_ALERT_DECODE_ERROR); 850 return tls13_send_alert(rl, TLS13_ALERT_DECODE_ERROR);
851 if (ccs != 1) 851 if (ccs != 1)
852 return tls13_send_alert(rl, TLS13_ALERT_ILLEGAL_PARAMETER); 852 return tls13_send_alert(rl, TLS13_ALERT_ILLEGAL_PARAMETER);
853 if (CBS_len(&cbs) != 0)
854 return tls13_send_alert(rl, TLS13_ALERT_DECODE_ERROR);
853 rl->ccs_seen++; 855 rl->ccs_seen++;
854 tls13_record_layer_rrec_free(rl); 856 tls13_record_layer_rrec_free(rl);
855 return TLS13_IO_WANT_RETRY; 857 return TLS13_IO_WANT_RETRY;