diff options
Diffstat (limited to 'src/lib/libssl/ssl_both.c')
-rw-r--r-- | src/lib/libssl/ssl_both.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/libssl/ssl_both.c b/src/lib/libssl/ssl_both.c index 4851231a8f..ad9b0ee257 100644 --- a/src/lib/libssl/ssl_both.c +++ b/src/lib/libssl/ssl_both.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_both.c,v 1.27 2021/03/29 16:46:09 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_both.c,v 1.28 2021/04/19 16:51:56 jsing Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -445,16 +445,16 @@ ssl3_get_message(SSL *s, int st1, int stn, int mt, long max, int *ok) | |||
445 | if (SSL_is_dtls(s)) | 445 | if (SSL_is_dtls(s)) |
446 | return (dtls1_get_message(s, st1, stn, mt, max, ok)); | 446 | return (dtls1_get_message(s, st1, stn, mt, max, ok)); |
447 | 447 | ||
448 | if (S3I(s)->tmp.reuse_message) { | 448 | if (S3I(s)->hs.tls12.reuse_message) { |
449 | S3I(s)->tmp.reuse_message = 0; | 449 | S3I(s)->hs.tls12.reuse_message = 0; |
450 | if ((mt >= 0) && (S3I(s)->tmp.message_type != mt)) { | 450 | if ((mt >= 0) && (S3I(s)->hs.tls12.message_type != mt)) { |
451 | al = SSL_AD_UNEXPECTED_MESSAGE; | 451 | al = SSL_AD_UNEXPECTED_MESSAGE; |
452 | SSLerror(s, SSL_R_UNEXPECTED_MESSAGE); | 452 | SSLerror(s, SSL_R_UNEXPECTED_MESSAGE); |
453 | goto fatal_err; | 453 | goto fatal_err; |
454 | } | 454 | } |
455 | *ok = 1; | 455 | *ok = 1; |
456 | s->internal->init_msg = s->internal->init_buf->data + 4; | 456 | s->internal->init_msg = s->internal->init_buf->data + 4; |
457 | s->internal->init_num = (int)S3I(s)->tmp.message_size; | 457 | s->internal->init_num = (int)S3I(s)->hs.tls12.message_size; |
458 | return s->internal->init_num; | 458 | return s->internal->init_num; |
459 | } | 459 | } |
460 | 460 | ||
@@ -511,7 +511,7 @@ ssl3_get_message(SSL *s, int st1, int stn, int mt, long max, int *ok) | |||
511 | SSLerror(s, ERR_R_BUF_LIB); | 511 | SSLerror(s, ERR_R_BUF_LIB); |
512 | goto err; | 512 | goto err; |
513 | } | 513 | } |
514 | S3I(s)->tmp.message_type = u8; | 514 | S3I(s)->hs.tls12.message_type = u8; |
515 | 515 | ||
516 | if (l > (unsigned long)max) { | 516 | if (l > (unsigned long)max) { |
517 | al = SSL_AD_ILLEGAL_PARAMETER; | 517 | al = SSL_AD_ILLEGAL_PARAMETER; |
@@ -522,7 +522,7 @@ ssl3_get_message(SSL *s, int st1, int stn, int mt, long max, int *ok) | |||
522 | SSLerror(s, ERR_R_BUF_LIB); | 522 | SSLerror(s, ERR_R_BUF_LIB); |
523 | goto err; | 523 | goto err; |
524 | } | 524 | } |
525 | S3I(s)->tmp.message_size = l; | 525 | S3I(s)->hs.tls12.message_size = l; |
526 | S3I(s)->hs.state = stn; | 526 | S3I(s)->hs.state = stn; |
527 | 527 | ||
528 | s->internal->init_msg = s->internal->init_buf->data + 4; | 528 | s->internal->init_msg = s->internal->init_buf->data + 4; |
@@ -531,7 +531,7 @@ ssl3_get_message(SSL *s, int st1, int stn, int mt, long max, int *ok) | |||
531 | 531 | ||
532 | /* next state (stn) */ | 532 | /* next state (stn) */ |
533 | p = s->internal->init_msg; | 533 | p = s->internal->init_msg; |
534 | n = S3I(s)->tmp.message_size - s->internal->init_num; | 534 | n = S3I(s)->hs.tls12.message_size - s->internal->init_num; |
535 | while (n > 0) { | 535 | while (n > 0) { |
536 | i = s->method->internal->ssl_read_bytes(s, SSL3_RT_HANDSHAKE, | 536 | i = s->method->internal->ssl_read_bytes(s, SSL3_RT_HANDSHAKE, |
537 | &p[s->internal->init_num], n, 0); | 537 | &p[s->internal->init_num], n, 0); |