summaryrefslogtreecommitdiff
path: root/src/lib/libssl/d1_both.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libssl/d1_both.c')
-rw-r--r--src/lib/libssl/d1_both.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/libssl/d1_both.c b/src/lib/libssl/d1_both.c
index 52189128c8..2e5e86641c 100644
--- a/src/lib/libssl/d1_both.c
+++ b/src/lib/libssl/d1_both.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: d1_both.c,v 1.75 2021/06/11 17:29:48 jsing Exp $ */ 1/* $OpenBSD: d1_both.c,v 1.76 2021/07/01 17:53:39 jsing Exp $ */
2/* 2/*
3 * DTLS implementation written by Nagendra Modadugu 3 * DTLS implementation written by Nagendra Modadugu
4 * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. 4 * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.
@@ -600,7 +600,7 @@ dtls1_reassemble_fragment(SSL *s, struct hm_header_st* msg_hdr, int *ok)
600 unsigned char devnull [256]; 600 unsigned char devnull [256];
601 601
602 while (frag_len) { 602 while (frag_len) {
603 i = s->method->internal->ssl_read_bytes(s, SSL3_RT_HANDSHAKE, 603 i = s->method->ssl_read_bytes(s, SSL3_RT_HANDSHAKE,
604 devnull, frag_len > sizeof(devnull) ? 604 devnull, frag_len > sizeof(devnull) ?
605 sizeof(devnull) : frag_len, 0); 605 sizeof(devnull) : frag_len, 0);
606 if (i <= 0) 606 if (i <= 0)
@@ -612,7 +612,7 @@ dtls1_reassemble_fragment(SSL *s, struct hm_header_st* msg_hdr, int *ok)
612 } 612 }
613 613
614 /* read the body of the fragment (header has already been read */ 614 /* read the body of the fragment (header has already been read */
615 i = s->method->internal->ssl_read_bytes(s, SSL3_RT_HANDSHAKE, 615 i = s->method->ssl_read_bytes(s, SSL3_RT_HANDSHAKE,
616 frag->fragment + msg_hdr->frag_off, frag_len, 0); 616 frag->fragment + msg_hdr->frag_off, frag_len, 0);
617 if (i <= 0 || (unsigned long)i != frag_len) 617 if (i <= 0 || (unsigned long)i != frag_len)
618 goto err; 618 goto err;
@@ -690,7 +690,7 @@ dtls1_process_out_of_seq_message(SSL *s, struct hm_header_st* msg_hdr, int *ok)
690 unsigned char devnull [256]; 690 unsigned char devnull [256];
691 691
692 while (frag_len) { 692 while (frag_len) {
693 i = s->method->internal->ssl_read_bytes(s, SSL3_RT_HANDSHAKE, 693 i = s->method->ssl_read_bytes(s, SSL3_RT_HANDSHAKE,
694 devnull, frag_len > sizeof(devnull) ? 694 devnull, frag_len > sizeof(devnull) ?
695 sizeof(devnull) : frag_len, 0); 695 sizeof(devnull) : frag_len, 0);
696 if (i <= 0) 696 if (i <= 0)
@@ -712,7 +712,7 @@ dtls1_process_out_of_seq_message(SSL *s, struct hm_header_st* msg_hdr, int *ok)
712 712
713 if (frag_len) { 713 if (frag_len) {
714 /* read the body of the fragment (header has already been read */ 714 /* read the body of the fragment (header has already been read */
715 i = s->method->internal->ssl_read_bytes(s, SSL3_RT_HANDSHAKE, 715 i = s->method->ssl_read_bytes(s, SSL3_RT_HANDSHAKE,
716 frag->fragment, frag_len, 0); 716 frag->fragment, frag_len, 0);
717 if (i <= 0 || (unsigned long)i != frag_len) 717 if (i <= 0 || (unsigned long)i != frag_len)
718 goto err; 718 goto err;
@@ -756,7 +756,7 @@ dtls1_get_message_fragment(SSL *s, int st1, int stn, long max, int *ok)
756 } 756 }
757 757
758 /* read handshake message header */ 758 /* read handshake message header */
759 i = s->method->internal->ssl_read_bytes(s, SSL3_RT_HANDSHAKE, wire, 759 i = s->method->ssl_read_bytes(s, SSL3_RT_HANDSHAKE, wire,
760 DTLS1_HM_HEADER_LENGTH, 0); 760 DTLS1_HM_HEADER_LENGTH, 0);
761 if (i <= 0) /* nbio, or an error */ 761 if (i <= 0) /* nbio, or an error */
762 { 762 {
@@ -825,7 +825,7 @@ dtls1_get_message_fragment(SSL *s, int st1, int stn, long max, int *ok)
825 if (frag_len > 0) { 825 if (frag_len > 0) {
826 unsigned char *p = (unsigned char *)s->internal->init_buf->data + DTLS1_HM_HEADER_LENGTH; 826 unsigned char *p = (unsigned char *)s->internal->init_buf->data + DTLS1_HM_HEADER_LENGTH;
827 827
828 i = s->method->internal->ssl_read_bytes(s, SSL3_RT_HANDSHAKE, 828 i = s->method->ssl_read_bytes(s, SSL3_RT_HANDSHAKE,
829 &p[frag_off], frag_len, 0); 829 &p[frag_off], frag_len, 0);
830 /* XDTLS: fix this--message fragments cannot span multiple packets */ 830 /* XDTLS: fix this--message fragments cannot span multiple packets */
831 if (i <= 0) { 831 if (i <= 0) {