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 e709caa604..a9a4c1a13b 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.45 2017/01/23 08:48:44 beck Exp $ */ 1/* $OpenBSD: d1_both.c,v 1.46 2017/01/23 13:36:12 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.
@@ -634,7 +634,7 @@ dtls1_reassemble_fragment(SSL *s, struct hm_header_st* msg_hdr, int *ok)
634 unsigned char devnull [256]; 634 unsigned char devnull [256];
635 635
636 while (frag_len) { 636 while (frag_len) {
637 i = s->method->ssl_read_bytes(s, SSL3_RT_HANDSHAKE, 637 i = s->method->internal->ssl_read_bytes(s, SSL3_RT_HANDSHAKE,
638 devnull, frag_len > sizeof(devnull) ? 638 devnull, frag_len > sizeof(devnull) ?
639 sizeof(devnull) : frag_len, 0); 639 sizeof(devnull) : frag_len, 0);
640 if (i <= 0) 640 if (i <= 0)
@@ -646,7 +646,7 @@ dtls1_reassemble_fragment(SSL *s, struct hm_header_st* msg_hdr, int *ok)
646 } 646 }
647 647
648 /* read the body of the fragment (header has already been read */ 648 /* read the body of the fragment (header has already been read */
649 i = s->method->ssl_read_bytes(s, SSL3_RT_HANDSHAKE, 649 i = s->method->internal->ssl_read_bytes(s, SSL3_RT_HANDSHAKE,
650 frag->fragment + msg_hdr->frag_off, frag_len, 0); 650 frag->fragment + msg_hdr->frag_off, frag_len, 0);
651 if (i <= 0 || (unsigned long)i != frag_len) 651 if (i <= 0 || (unsigned long)i != frag_len)
652 goto err; 652 goto err;
@@ -724,7 +724,7 @@ dtls1_process_out_of_seq_message(SSL *s, struct hm_header_st* msg_hdr, int *ok)
724 unsigned char devnull [256]; 724 unsigned char devnull [256];
725 725
726 while (frag_len) { 726 while (frag_len) {
727 i = s->method->ssl_read_bytes(s, SSL3_RT_HANDSHAKE, 727 i = s->method->internal->ssl_read_bytes(s, SSL3_RT_HANDSHAKE,
728 devnull, frag_len > sizeof(devnull) ? 728 devnull, frag_len > sizeof(devnull) ?
729 sizeof(devnull) : frag_len, 0); 729 sizeof(devnull) : frag_len, 0);
730 if (i <= 0) 730 if (i <= 0)
@@ -746,7 +746,7 @@ dtls1_process_out_of_seq_message(SSL *s, struct hm_header_st* msg_hdr, int *ok)
746 746
747 if (frag_len) { 747 if (frag_len) {
748 /* read the body of the fragment (header has already been read */ 748 /* read the body of the fragment (header has already been read */
749 i = s->method->ssl_read_bytes(s, SSL3_RT_HANDSHAKE, 749 i = s->method->internal->ssl_read_bytes(s, SSL3_RT_HANDSHAKE,
750 frag->fragment, frag_len, 0); 750 frag->fragment, frag_len, 0);
751 if (i <= 0 || (unsigned long)i != frag_len) 751 if (i <= 0 || (unsigned long)i != frag_len)
752 goto err; 752 goto err;
@@ -790,7 +790,7 @@ again:
790 } 790 }
791 791
792 /* read handshake message header */ 792 /* read handshake message header */
793 i = s->method->ssl_read_bytes(s, SSL3_RT_HANDSHAKE, wire, 793 i = s->method->internal->ssl_read_bytes(s, SSL3_RT_HANDSHAKE, wire,
794 DTLS1_HM_HEADER_LENGTH, 0); 794 DTLS1_HM_HEADER_LENGTH, 0);
795 if (i <= 0) /* nbio, or an error */ 795 if (i <= 0) /* nbio, or an error */
796 { 796 {
@@ -861,7 +861,7 @@ again:
861 if (frag_len > 0) { 861 if (frag_len > 0) {
862 unsigned char *p = (unsigned char *)s->internal->init_buf->data + DTLS1_HM_HEADER_LENGTH; 862 unsigned char *p = (unsigned char *)s->internal->init_buf->data + DTLS1_HM_HEADER_LENGTH;
863 863
864 i = s->method->ssl_read_bytes(s, SSL3_RT_HANDSHAKE, 864 i = s->method->internal->ssl_read_bytes(s, SSL3_RT_HANDSHAKE,
865 &p[frag_off], frag_len, 0); 865 &p[frag_off], frag_len, 0);
866 /* XDTLS: fix this--message fragments cannot span multiple packets */ 866 /* XDTLS: fix this--message fragments cannot span multiple packets */
867 if (i <= 0) { 867 if (i <= 0) {