Add code to handle change of cipher state in the new TLSv1.2 record layer.

This provides the basic framework for handling change of cipher state in
the new TLSv1.2 record layer, creating new record protection. In the DTLS
case we retain the previous write record protection and can switch back to
it when retransmitting. This will allow the record layer to start owning
sequence numbers and encryption/decryption state.

ok inoguchi@ tb@

1 files changed, 17 insertions, 3 deletions

diff --git a/src/lib/libssl/t1_enc.c b/src/lib/libssl/t1_enc.c
index 6c376be2e0..875aae36b0 100644
--- a/src/lib/libssl/t1_enc.c
+++ b/src/lib/libssl/t1_enc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: t1_enc.c,v 1.128 2021/01/07 15:32:59 jsing Exp $ */
+/* $OpenBSD: t1_enc.c,v 1.129 2021/01/19 19:07:39 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -562,7 +562,21 @@ tls1_change_cipher_state(SSL *s, int which)
 
         if (key_block - S3I(s)->hs.key_block != S3I(s)->hs.key_block_len) {
                 SSLerror(s, ERR_R_INTERNAL_ERROR);
-                goto err2;
+                goto err;
+        }
+
+        if (is_read) {
+                if (!tls12_record_layer_change_read_cipher_state(s->internal->rl,
+                    mac_secret, mac_secret_size, key, key_len, iv, iv_len))
+                        goto err;
+                tls12_record_layer_set_read_seq_num(s->internal->rl,
+                    S3I(s)->read_sequence);
+        } else {
+                if (!tls12_record_layer_change_write_cipher_state(s->internal->rl,
+                    mac_secret, mac_secret_size, key, key_len, iv, iv_len))
+                        goto err;
+                tls12_record_layer_set_write_seq_num(s->internal->rl,
+                    S3I(s)->write_sequence);
         }
 
         if (aead != NULL) {
@@ -573,7 +587,7 @@ tls1_change_cipher_state(SSL *s, int which)
         return tls1_change_cipher_state_cipher(s, is_read,
             mac_secret, mac_secret_size, key, key_len, iv, iv_len);
 
-err2:
+ err:
         return (0);
 }