From d3ea176e147145d3bbf57b91913d656b07ae80ef Mon Sep 17 00:00:00 2001 From: jsing <> Date: Mon, 19 Apr 2021 17:03:39 +0000 Subject: Move new_mac_secret_size into the TLSv1.2 handshake struct. Drop the 'new_' prefix in the process. ok inoguchi@ tb@ --- src/lib/libssl/ssl_locl.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/lib/libssl/ssl_locl.h') diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h index 3b86f5874b..f5287b2580 100644 --- a/src/lib/libssl/ssl_locl.h +++ b/src/lib/libssl/ssl_locl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_locl.h,v 1.334 2021/04/19 16:51:56 jsing Exp $ */ +/* $OpenBSD: ssl_locl.h,v 1.335 2021/04/19 17:03:39 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -427,6 +427,9 @@ typedef struct ssl_handshake_tls12_st { /* Reuse current handshake message. */ int reuse_message; + /* Size of the MAC secret. */ + int mac_secret_size; + /* Record-layer key block for TLS 1.2 and earlier. */ unsigned char *key_block; size_t key_block_len; @@ -950,7 +953,6 @@ typedef struct ssl3_state_internal_st { const EVP_CIPHER *new_sym_enc; const EVP_AEAD *new_aead; - int new_mac_secret_size; int cert_request; } tmp; -- cgit v1.2.3-55-g6feb