commit 4e41926774f2d1ab3a56610d5bcf6833642a1299
author David Benjamin <davidben@google.com> Mon Nov 07 15:45:53 2016 -0500
committer Adam Langley <agl@google.com> Wed Nov 09 17:02:33 2016 +0000
tree eb4b94e1864c32ed4ab45bf8688f514d04561798
parent 54955fe7111ebef568bf986b4bb60b090598ad31

Move key_block into SSL_HANDSHAKE.

This is already manually released at the end of the handshake. With this
change, it can happen implicitly, and SSL3_STATE shrinks further by
another pointer.

Change-Id: I94b9f2e4df55e8f2aa0b3a8799baa3b9a34d7ac1
Reviewed-on: https://boringssl-review.googlesource.com/12121
Reviewed-by: Adam Langley <agl@google.com>

ssl/internal.h

diff --git a/ssl/internal.h b/ssl/internal.h
index a054bbf..7badc5b 100644
--- a/ssl/internal.h
+++ b/ssl/internal.h
@@ -1003,6 +1003,10 @@
    * received in a CertificateRequest message. */
   uint8_t *certificate_types;
   size_t num_certificate_types;
+
+  /* key_block is the record-layer key block for TLS 1.2 and earlier. */
+  uint8_t *key_block;
+  uint8_t key_block_len;
 } SSL_HANDSHAKE;
 
 SSL_HANDSHAKE *ssl_handshake_new(enum ssl_hs_wait_t (*do_handshake)(SSL *ssl));
@@ -1435,9 +1439,6 @@
 
     int reuse_message;
 
-    uint8_t *key_block;
-    uint8_t key_block_length;
-
     uint8_t new_mac_secret_len;
     uint8_t new_key_len;
     uint8_t new_fixed_iv_len;
@@ -1681,7 +1682,6 @@
 
 int ssl3_get_finished(SSL *ssl);
 int ssl3_send_change_cipher_spec(SSL *ssl);
-void ssl3_cleanup_key_block(SSL *ssl);
 int ssl3_send_alert(SSL *ssl, int level, int desc);
 int ssl3_get_message(SSL *ssl, int msg_type,
                      enum ssl_hash_message_t hash_message);