2 files changed, 36 insertions, 16 deletions
diff --git a/src/lib/libssl/src/ssl/t1_enc.c b/src/lib/libssl/src/ssl/t1_enc.c
index 894b521e71..87860feda9 100644
--- a/src/lib/libssl/src/ssl/t1_enc.c
+++ b/src/lib/libssl/src/ssl/t1_enc.c
@@ -386,7 +386,11 @@ tls1_change_cipher_state(SSL *s, int which)
                        EVP_CIPHER_CTX_init(s->enc_read_ctx);
                }
                dd = s->enc_read_ctx;
-                mac_ctx = ssl_replace_hash(&s->read_hash, NULL);
+                ssl_clear_hash_ctx(&s->read_hash);
+                if ((mac_ctx = EVP_MD_CTX_create()) == NULL)
+                        goto err;
+                s->read_hash = mac_ctx;
                /* this is done by dtls1_reset_seq_numbers for DTLS1_VERSION */
                if (s->version != DTLS1_VERSION)
@@ -403,13 +407,19 @@ tls1_change_cipher_state(SSL *s, int which)
                else if ((s->enc_write_ctx = EVP_CIPHER_CTX_new()) == NULL)
                        goto err;
                dd = s->enc_write_ctx;
-                if (SSL_IS_DTLS(s)) {
-                        mac_ctx = EVP_MD_CTX_create();
+                /*
-                        if (!mac_ctx)
+                 * DTLS fragments retain a pointer to the compression, cipher
-                                goto err;
+                 * and hash contexts, so that it can restore state in order
-                        s->write_hash = mac_ctx;
+                 * to perform retransmissions. As such, we cannot free write
-                } else
+                 * contexts that are used for DTLS - these are instead freed
-                        mac_ctx = ssl_replace_hash(&s->write_hash, NULL);
+                 * by DTLS when its frees a ChangeCipherSpec fragment.
+                 */
+                if (!SSL_IS_DTLS(s))
+                        ssl_clear_hash_ctx(&s->write_hash);
+                if ((mac_ctx = EVP_MD_CTX_create()) == NULL)
+                        goto err;
+                s->write_hash = mac_ctx;
                /* this is done by dtls1_reset_seq_numbers for DTLS1_VERSION */
                if (s->version != DTLS1_VERSION)
diff --git a/src/lib/libssl/t1_enc.c b/src/lib/libssl/t1_enc.c
index 894b521e71..87860feda9 100644
--- a/src/lib/libssl/t1_enc.c
+++ b/src/lib/libssl/t1_enc.c
@@ -386,7 +386,11 @@ tls1_change_cipher_state(SSL *s, int which)
                        EVP_CIPHER_CTX_init(s->enc_read_ctx);
                }
                dd = s->enc_read_ctx;
-                mac_ctx = ssl_replace_hash(&s->read_hash, NULL);
+                ssl_clear_hash_ctx(&s->read_hash);
+                if ((mac_ctx = EVP_MD_CTX_create()) == NULL)
+                        goto err;
+                s->read_hash = mac_ctx;
                /* this is done by dtls1_reset_seq_numbers for DTLS1_VERSION */
                if (s->version != DTLS1_VERSION)
@@ -403,13 +407,19 @@ tls1_change_cipher_state(SSL *s, int which)
                else if ((s->enc_write_ctx = EVP_CIPHER_CTX_new()) == NULL)
                        goto err;
                dd = s->enc_write_ctx;
-                if (SSL_IS_DTLS(s)) {
-                        mac_ctx = EVP_MD_CTX_create();
+                /*
-                        if (!mac_ctx)
+                 * DTLS fragments retain a pointer to the compression, cipher
-                                goto err;
+                 * and hash contexts, so that it can restore state in order
-                        s->write_hash = mac_ctx;
+                 * to perform retransmissions. As such, we cannot free write
-                } else
+                 * contexts that are used for DTLS - these are instead freed
-                        mac_ctx = ssl_replace_hash(&s->write_hash, NULL);
+                 * by DTLS when its frees a ChangeCipherSpec fragment.
+                 */
+                if (!SSL_IS_DTLS(s))
+                        ssl_clear_hash_ctx(&s->write_hash);
+                if ((mac_ctx = EVP_MD_CTX_create()) == NULL)
+                        goto err;
+                s->write_hash = mac_ctx;
                /* this is done by dtls1_reset_seq_numbers for DTLS1_VERSION */
                if (s->version != DTLS1_VERSION)

diff --git a/src/lib/libssl/src/ssl/t1_enc.c b/src/lib/libssl/src/ssl/t1_enc.c index 894b521e71..87860feda9 100644 --- a/src/lib/libssl/src/ssl/t1_enc.c +++ b/src/lib/libssl/src/ssl/t1_enc.c
@@ -386,7 +386,11 @@ tls1_change_cipher_state(SSL *s, int which)
386	EVP_CIPHER_CTX_init(s->enc_read_ctx);	386	EVP_CIPHER_CTX_init(s->enc_read_ctx);
387	}	387	}
388	dd = s->enc_read_ctx;	388	dd = s->enc_read_ctx;
389	mac_ctx = ssl_replace_hash(&s->read_hash, NULL);	389
		390	ssl_clear_hash_ctx(&s->read_hash);
		391	if ((mac_ctx = EVP_MD_CTX_create()) == NULL)
		392	goto err;
		393	s->read_hash = mac_ctx;
390		394
391	/* this is done by dtls1_reset_seq_numbers for DTLS1_VERSION */	395	/* this is done by dtls1_reset_seq_numbers for DTLS1_VERSION */
392	if (s->version != DTLS1_VERSION)	396	if (s->version != DTLS1_VERSION)
@@ -403,13 +407,19 @@ tls1_change_cipher_state(SSL *s, int which)
403	else if ((s->enc_write_ctx = EVP_CIPHER_CTX_new()) == NULL)	407	else if ((s->enc_write_ctx = EVP_CIPHER_CTX_new()) == NULL)
404	goto err;	408	goto err;
405	dd = s->enc_write_ctx;	409	dd = s->enc_write_ctx;
406	if (SSL_IS_DTLS(s)) {	410
407	mac_ctx = EVP_MD_CTX_create();	411	/*
408	if (!mac_ctx)	412	* DTLS fragments retain a pointer to the compression, cipher
409	goto err;	413	* and hash contexts, so that it can restore state in order
410	s->write_hash = mac_ctx;	414	* to perform retransmissions. As such, we cannot free write
411	} else	415	* contexts that are used for DTLS - these are instead freed
412	mac_ctx = ssl_replace_hash(&s->write_hash, NULL);	416	* by DTLS when its frees a ChangeCipherSpec fragment.
		417	*/
		418	if (!SSL_IS_DTLS(s))
		419	ssl_clear_hash_ctx(&s->write_hash);
		420	if ((mac_ctx = EVP_MD_CTX_create()) == NULL)
		421	goto err;
		422	s->write_hash = mac_ctx;
413		423
414	/* this is done by dtls1_reset_seq_numbers for DTLS1_VERSION */	424	/* this is done by dtls1_reset_seq_numbers for DTLS1_VERSION */
415	if (s->version != DTLS1_VERSION)	425	if (s->version != DTLS1_VERSION)


diff --git a/src/lib/libssl/t1_enc.c b/src/lib/libssl/t1_enc.c index 894b521e71..87860feda9 100644 --- a/src/lib/libssl/t1_enc.c +++ b/src/lib/libssl/t1_enc.c
@@ -386,7 +386,11 @@ tls1_change_cipher_state(SSL *s, int which)
386	EVP_CIPHER_CTX_init(s->enc_read_ctx);	386	EVP_CIPHER_CTX_init(s->enc_read_ctx);
387	}	387	}
388	dd = s->enc_read_ctx;	388	dd = s->enc_read_ctx;
389	mac_ctx = ssl_replace_hash(&s->read_hash, NULL);	389
		390	ssl_clear_hash_ctx(&s->read_hash);
		391	if ((mac_ctx = EVP_MD_CTX_create()) == NULL)
		392	goto err;
		393	s->read_hash = mac_ctx;
390		394
391	/* this is done by dtls1_reset_seq_numbers for DTLS1_VERSION */	395	/* this is done by dtls1_reset_seq_numbers for DTLS1_VERSION */
392	if (s->version != DTLS1_VERSION)	396	if (s->version != DTLS1_VERSION)
@@ -403,13 +407,19 @@ tls1_change_cipher_state(SSL *s, int which)
403	else if ((s->enc_write_ctx = EVP_CIPHER_CTX_new()) == NULL)	407	else if ((s->enc_write_ctx = EVP_CIPHER_CTX_new()) == NULL)
404	goto err;	408	goto err;
405	dd = s->enc_write_ctx;	409	dd = s->enc_write_ctx;
406	if (SSL_IS_DTLS(s)) {	410
407	mac_ctx = EVP_MD_CTX_create();	411	/*
408	if (!mac_ctx)	412	* DTLS fragments retain a pointer to the compression, cipher
409	goto err;	413	* and hash contexts, so that it can restore state in order
410	s->write_hash = mac_ctx;	414	* to perform retransmissions. As such, we cannot free write
411	} else	415	* contexts that are used for DTLS - these are instead freed
412	mac_ctx = ssl_replace_hash(&s->write_hash, NULL);	416	* by DTLS when its frees a ChangeCipherSpec fragment.
		417	*/
		418	if (!SSL_IS_DTLS(s))
		419	ssl_clear_hash_ctx(&s->write_hash);
		420	if ((mac_ctx = EVP_MD_CTX_create()) == NULL)
		421	goto err;
		422	s->write_hash = mac_ctx;
413		423
414	/* this is done by dtls1_reset_seq_numbers for DTLS1_VERSION */	424	/* this is done by dtls1_reset_seq_numbers for DTLS1_VERSION */
415	if (s->version != DTLS1_VERSION)	425	if (s->version != DTLS1_VERSION)