Keep EtM state across renegotiations

2014-11-04 17:36:18 +01:00 · 2014-11-04 17:36:18 +01:00 · 1a03473576
commit 1a03473576
parent 169dd6a514
1 changed files with 6 additions and 0 deletions
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@ -3248,6 +3248,12 @@ void ssl_handshake_wrapup( ssl_context *ssl )

    if( ssl->session )
    {
+#if defined(POLARSSL_SSL_ENCRYPT_THEN_MAC)
+        /* RFC 7366 3.1: keep the EtM state */
+        ssl->session_negotiate->encrypt_then_mac =
+                  ssl->session->encrypt_then_mac;
+#endif
+
        ssl_session_free( ssl->session );
        polarssl_free( ssl->session );
    }