diff options
Diffstat (limited to 'src/lib/libssl')
| -rw-r--r-- | src/lib/libssl/ssl_both.c | 13 | ||||
| -rw-r--r-- | src/lib/libssl/ssl_local.h | 4 | ||||
| -rw-r--r-- | src/lib/libssl/ssl_pkt.c | 3 | ||||
| -rw-r--r-- | src/lib/libssl/tls13_legacy.c | 3 |
4 files changed, 8 insertions, 15 deletions
diff --git a/src/lib/libssl/ssl_both.c b/src/lib/libssl/ssl_both.c index 995f1c4601..5a704233c9 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.47 2024/02/03 15:58:33 beck Exp $ */ | 1 | /* $OpenBSD: ssl_both.c,v 1.48 2026/04/03 07:17:36 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 | * |
| @@ -358,14 +358,11 @@ ssl3_get_message(SSL *s, int st1, int stn, int mt, long max) | |||
| 358 | } | 358 | } |
| 359 | 359 | ||
| 360 | /* Feed this message into MAC computation. */ | 360 | /* Feed this message into MAC computation. */ |
| 361 | if (s->mac_packet) { | 361 | tls1_transcript_record(s, (unsigned char *)s->init_buf->data, |
| 362 | tls1_transcript_record(s, (unsigned char *)s->init_buf->data, | 362 | s->init_num + SSL3_HM_HEADER_LENGTH); |
| 363 | s->init_num + SSL3_HM_HEADER_LENGTH); | ||
| 364 | 363 | ||
| 365 | ssl_msg_callback(s, 0, SSL3_RT_HANDSHAKE, | 364 | ssl_msg_callback(s, 0, SSL3_RT_HANDSHAKE, s->init_buf->data, |
| 366 | s->init_buf->data, | 365 | (size_t)s->init_num + SSL3_HM_HEADER_LENGTH); |
| 367 | (size_t)s->init_num + SSL3_HM_HEADER_LENGTH); | ||
| 368 | } | ||
| 369 | 366 | ||
| 370 | return 1; | 367 | return 1; |
| 371 | 368 | ||
diff --git a/src/lib/libssl/ssl_local.h b/src/lib/libssl/ssl_local.h index 7942c36dbd..45e57ead9e 100644 --- a/src/lib/libssl/ssl_local.h +++ b/src/lib/libssl/ssl_local.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ssl_local.h,v 1.35 2025/12/04 21:16:17 beck Exp $ */ | 1 | /* $OpenBSD: ssl_local.h,v 1.36 2026/04/03 07:17:36 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 | * |
| @@ -1057,8 +1057,6 @@ struct ssl_st { | |||
| 1057 | 1057 | ||
| 1058 | int rstate; /* where we are when reading */ | 1058 | int rstate; /* where we are when reading */ |
| 1059 | 1059 | ||
| 1060 | int mac_packet; | ||
| 1061 | |||
| 1062 | int empty_record_count; | 1060 | int empty_record_count; |
| 1063 | 1061 | ||
| 1064 | size_t num_tickets; /* Unused, for OpenSSL compatibility */ | 1062 | size_t num_tickets; /* Unused, for OpenSSL compatibility */ |
diff --git a/src/lib/libssl/ssl_pkt.c b/src/lib/libssl/ssl_pkt.c index 7032175aac..d2921228c1 100644 --- a/src/lib/libssl/ssl_pkt.c +++ b/src/lib/libssl/ssl_pkt.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ssl_pkt.c,v 1.69 2025/03/12 14:03:55 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_pkt.c,v 1.70 2026/04/03 07:17:36 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 | * |
| @@ -350,7 +350,6 @@ ssl3_get_record(SSL *s) | |||
| 350 | if (n <= 0) | 350 | if (n <= 0) |
| 351 | return (n); | 351 | return (n); |
| 352 | 352 | ||
| 353 | s->mac_packet = 1; | ||
| 354 | s->rstate = SSL_ST_READ_BODY; | 353 | s->rstate = SSL_ST_READ_BODY; |
| 355 | 354 | ||
| 356 | if (s->server && s->first_packet) { | 355 | if (s->server && s->first_packet) { |
diff --git a/src/lib/libssl/tls13_legacy.c b/src/lib/libssl/tls13_legacy.c index 6c33eccc61..6a06330b22 100644 --- a/src/lib/libssl/tls13_legacy.c +++ b/src/lib/libssl/tls13_legacy.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: tls13_legacy.c,v 1.44 2024/01/30 14:50:50 jsing Exp $ */ | 1 | /* $OpenBSD: tls13_legacy.c,v 1.45 2026/04/03 07:17:36 jsing Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 2018, 2019 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2018, 2019 Joel Sing <jsing@openbsd.org> |
| 4 | * | 4 | * |
| @@ -353,7 +353,6 @@ tls13_use_legacy_stack(struct tls13_ctx *ctx) | |||
| 353 | s->rstate = SSL_ST_READ_BODY; | 353 | s->rstate = SSL_ST_READ_BODY; |
| 354 | s->packet = s->s3->rbuf.buf; | 354 | s->packet = s->s3->rbuf.buf; |
| 355 | s->packet_length = SSL3_RT_HEADER_LENGTH; | 355 | s->packet_length = SSL3_RT_HEADER_LENGTH; |
| 356 | s->mac_packet = 1; | ||
| 357 | } | 356 | } |
| 358 | 357 | ||
| 359 | /* Stash the current handshake message. */ | 358 | /* Stash the current handshake message. */ |
