diff options
| author | Matt Caswell <matt@openssl.org> | 2018-11-08 15:03:17 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2018-11-15 12:48:08 +0100 |
| commit | 157af9be4106c951afadf7b12afe4cbaba0c0823 (patch) | |
| tree | 90791b61aa98621245b94cfbf3317037bcb8b248 /ssl/t1_enc.c | |
| parent | Deprecate SSL_set_tmp_ecdh (diff) | |
| download | openssl-157af9be4106c951afadf7b12afe4cbaba0c0823.tar.xz openssl-157af9be4106c951afadf7b12afe4cbaba0c0823.zip | |
Add a missing SSLfatal call
A missing SSLfatal call can result in an assertion failed error if the
condition gets triggered.
Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7594)
Diffstat (limited to 'ssl/t1_enc.c')
| -rw-r--r-- | ssl/t1_enc.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ssl/t1_enc.c b/ssl/t1_enc.c index 2db913fb06..2be37c76b2 100644 --- a/ssl/t1_enc.c +++ b/ssl/t1_enc.c @@ -131,8 +131,11 @@ int tls1_change_cipher_state(SSL *s, int which) } dd = s->enc_read_ctx; mac_ctx = ssl_replace_hash(&s->read_hash, NULL); - if (mac_ctx == NULL) + if (mac_ctx == NULL) { + SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_TLS1_CHANGE_CIPHER_STATE, + ERR_R_INTERNAL_ERROR); goto err; + } #ifndef OPENSSL_NO_COMP COMP_CTX_free(s->expand); s->expand = NULL; |