diff options
author | Matt Caswell <matt@openssl.org> | 2016-06-03 11:59:19 +0100 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2016-06-03 20:29:04 +0100 |
commit | 2c4a056f59a6819b8a0d40e3a7e11cf6d35b3e88 (patch) | |
tree | c9d9275b21fc98c0f18f44729c1b0cbaf93c1a50 /ssl/statem/statem_clnt.c | |
parent | fa28bfd66fc221e18ee57134e42b54b4012e66db (diff) |
Handle a memory allocation failure in ssl3_init_finished_mac()
The ssl3_init_finished_mac() function can fail, in which case we need to
propagate the error up through the stack.
RT#3198
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'ssl/statem/statem_clnt.c')
-rw-r--r-- | ssl/statem/statem_clnt.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ssl/statem/statem_clnt.c b/ssl/statem/statem_clnt.c index ecbc43b3d0..a97f0cc6bf 100644 --- a/ssl/statem/statem_clnt.c +++ b/ssl/statem/statem_clnt.c @@ -391,7 +391,10 @@ WORK_STATE ossl_statem_client_pre_work(SSL *s, WORK_STATE wst) s->shutdown = 0; if (SSL_IS_DTLS(s)) { /* every DTLS ClientHello resets Finished MAC */ - ssl3_init_finished_mac(s); + if (!ssl3_init_finished_mac(s)) { + ossl_statem_set_error(s); + return WORK_ERROR; + } } break; |