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/ssl_locl.h | |
| parent | fa28bfd66fc221e18ee57134e42b54b4012e66db (diff) | |
| download | openssl-2c4a056f59a6819b8a0d40e3a7e11cf6d35b3e88.zip openssl-2c4a056f59a6819b8a0d40e3a7e11cf6d35b3e88.tar.gz openssl-2c4a056f59a6819b8a0d40e3a7e11cf6d35b3e88.tar.bz2 | |
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/ssl_locl.h')
| -rw-r--r-- | ssl/ssl_locl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h index 243535f..35fd3fc 100644 --- a/ssl/ssl_locl.h +++ b/ssl/ssl_locl.h @@ -1859,7 +1859,7 @@ __owur EVP_PKEY *ssl_dh_to_pkey(DH *dh); __owur const SSL_CIPHER *ssl3_get_cipher_by_char(const unsigned char *p); __owur int ssl3_put_cipher_by_char(const SSL_CIPHER *c, unsigned char *p); -void ssl3_init_finished_mac(SSL *s); +int ssl3_init_finished_mac(SSL *s); __owur int ssl3_setup_key_block(SSL *s); __owur int ssl3_change_cipher_state(SSL *s, int which); void ssl3_cleanup_key_block(SSL *s); |