diff options
Diffstat (limited to 'src/lib/libssl/d1_both.c')
-rw-r--r-- | src/lib/libssl/d1_both.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/libssl/d1_both.c b/src/lib/libssl/d1_both.c index f4c1cb95b0..ba05c2a354 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.68 2021/02/27 14:20:50 jsing Exp $ */ | 1 | /* $OpenBSD: d1_both.c,v 1.69 2021/04/19 16:51:56 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. |
@@ -380,16 +380,16 @@ dtls1_get_message(SSL *s, int st1, int stn, int mt, long max, int *ok) | |||
380 | * s3->internal->tmp is used to store messages that are unexpected, caused | 380 | * s3->internal->tmp is used to store messages that are unexpected, caused |
381 | * by the absence of an optional handshake message | 381 | * by the absence of an optional handshake message |
382 | */ | 382 | */ |
383 | if (S3I(s)->tmp.reuse_message) { | 383 | if (S3I(s)->hs.tls12.reuse_message) { |
384 | S3I(s)->tmp.reuse_message = 0; | 384 | S3I(s)->hs.tls12.reuse_message = 0; |
385 | if ((mt >= 0) && (S3I(s)->tmp.message_type != mt)) { | 385 | if ((mt >= 0) && (S3I(s)->hs.tls12.message_type != mt)) { |
386 | al = SSL_AD_UNEXPECTED_MESSAGE; | 386 | al = SSL_AD_UNEXPECTED_MESSAGE; |
387 | SSLerror(s, SSL_R_UNEXPECTED_MESSAGE); | 387 | SSLerror(s, SSL_R_UNEXPECTED_MESSAGE); |
388 | goto fatal_err; | 388 | goto fatal_err; |
389 | } | 389 | } |
390 | *ok = 1; | 390 | *ok = 1; |
391 | s->internal->init_msg = s->internal->init_buf->data + DTLS1_HM_HEADER_LENGTH; | 391 | s->internal->init_msg = s->internal->init_buf->data + DTLS1_HM_HEADER_LENGTH; |
392 | s->internal->init_num = (int)S3I(s)->tmp.message_size; | 392 | s->internal->init_num = (int)S3I(s)->hs.tls12.message_size; |
393 | return s->internal->init_num; | 393 | return s->internal->init_num; |
394 | } | 394 | } |
395 | 395 | ||
@@ -466,9 +466,9 @@ dtls1_preprocess_fragment(SSL *s, struct hm_header_st *msg_hdr, int max) | |||
466 | return SSL_AD_INTERNAL_ERROR; | 466 | return SSL_AD_INTERNAL_ERROR; |
467 | } | 467 | } |
468 | 468 | ||
469 | S3I(s)->tmp.message_size = msg_len; | 469 | S3I(s)->hs.tls12.message_size = msg_len; |
470 | D1I(s)->r_msg_hdr.msg_len = msg_len; | 470 | D1I(s)->r_msg_hdr.msg_len = msg_len; |
471 | S3I(s)->tmp.message_type = msg_hdr->type; | 471 | S3I(s)->hs.tls12.message_type = msg_hdr->type; |
472 | D1I(s)->r_msg_hdr.type = msg_hdr->type; | 472 | D1I(s)->r_msg_hdr.type = msg_hdr->type; |
473 | D1I(s)->r_msg_hdr.seq = msg_hdr->seq; | 473 | D1I(s)->r_msg_hdr.seq = msg_hdr->seq; |
474 | } else if (msg_len != D1I(s)->r_msg_hdr.msg_len) { | 474 | } else if (msg_len != D1I(s)->r_msg_hdr.msg_len) { |