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.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/libssl/d1_both.c b/src/lib/libssl/d1_both.c
index ba4e9edd8d..06a8585e10 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.66 2021/01/26 14:22:19 jsing Exp $ */ 1/* $OpenBSD: d1_both.c,v 1.67 2021/02/20 14:14:16 tb 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.
@@ -391,7 +391,7 @@ dtls1_get_message(SSL *s, int st1, int stn, int mt, long max, int *ok)
391 if ((mt >= 0) && (S3I(s)->tmp.message_type != mt)) { 391 if ((mt >= 0) && (S3I(s)->tmp.message_type != mt)) {
392 al = SSL_AD_UNEXPECTED_MESSAGE; 392 al = SSL_AD_UNEXPECTED_MESSAGE;
393 SSLerror(s, SSL_R_UNEXPECTED_MESSAGE); 393 SSLerror(s, SSL_R_UNEXPECTED_MESSAGE);
394 goto f_err; 394 goto fatal_err;
395 } 395 }
396 *ok = 1; 396 *ok = 1;
397 s->internal->init_msg = s->internal->init_buf->data + DTLS1_HM_HEADER_LENGTH; 397 s->internal->init_msg = s->internal->init_buf->data + DTLS1_HM_HEADER_LENGTH;
@@ -433,7 +433,7 @@ again:
433 s->internal->init_msg = s->internal->init_buf->data + DTLS1_HM_HEADER_LENGTH; 433 s->internal->init_msg = s->internal->init_buf->data + DTLS1_HM_HEADER_LENGTH;
434 return s->internal->init_num; 434 return s->internal->init_num;
435 435
436f_err: 436 fatal_err:
437 ssl3_send_alert(s, SSL3_AL_FATAL, al); 437 ssl3_send_alert(s, SSL3_AL_FATAL, al);
438 *ok = 0; 438 *ok = 0;
439 return -1; 439 return -1;
@@ -776,7 +776,7 @@ again:
776 dtls1_get_message_header(wire, &msg_hdr) == 0) { 776 dtls1_get_message_header(wire, &msg_hdr) == 0) {
777 al = SSL_AD_UNEXPECTED_MESSAGE; 777 al = SSL_AD_UNEXPECTED_MESSAGE;
778 SSLerror(s, SSL_R_UNEXPECTED_MESSAGE); 778 SSLerror(s, SSL_R_UNEXPECTED_MESSAGE);
779 goto f_err; 779 goto fatal_err;
780 } 780 }
781 781
782 /* 782 /*
@@ -818,12 +818,12 @@ again:
818 { 818 {
819 al = SSL_AD_UNEXPECTED_MESSAGE; 819 al = SSL_AD_UNEXPECTED_MESSAGE;
820 SSLerror(s, SSL_R_UNEXPECTED_MESSAGE); 820 SSLerror(s, SSL_R_UNEXPECTED_MESSAGE);
821 goto f_err; 821 goto fatal_err;
822 } 822 }
823 } 823 }
824 824
825 if ((al = dtls1_preprocess_fragment(s, &msg_hdr, max))) 825 if ((al = dtls1_preprocess_fragment(s, &msg_hdr, max)))
826 goto f_err; 826 goto fatal_err;
827 827
828 /* XDTLS: ressurect this when restart is in place */ 828 /* XDTLS: ressurect this when restart is in place */
829 S3I(s)->hs.state = stn; 829 S3I(s)->hs.state = stn;
@@ -849,7 +849,7 @@ again:
849 if (i != (int)frag_len) { 849 if (i != (int)frag_len) {
850 al = SSL3_AD_ILLEGAL_PARAMETER; 850 al = SSL3_AD_ILLEGAL_PARAMETER;
851 SSLerror(s, SSL3_AD_ILLEGAL_PARAMETER); 851 SSLerror(s, SSL3_AD_ILLEGAL_PARAMETER);
852 goto f_err; 852 goto fatal_err;
853 } 853 }
854 854
855 *ok = 1; 855 *ok = 1;
@@ -863,7 +863,7 @@ again:
863 s->internal->init_num = frag_len; 863 s->internal->init_num = frag_len;
864 return frag_len; 864 return frag_len;
865 865
866f_err: 866 fatal_err:
867 ssl3_send_alert(s, SSL3_AL_FATAL, al); 867 ssl3_send_alert(s, SSL3_AL_FATAL, al);
868 s->internal->init_num = 0; 868 s->internal->init_num = 0;
869 869