diff options
author | jsing <> | 2014-12-10 15:43:31 +0000 |
---|---|---|
committer | jsing <> | 2014-12-10 15:43:31 +0000 |
commit | 47eb97a22f4397f7e4d7b37419d4c88e805cf71b (patch) | |
tree | 626ac5debee47cd4bf6f23ff35253234be5bbe4d /src/lib/libssl/d1_clnt.c | |
parent | 1434a91c4d4dc782915ce81dd056fa8f6cb77ae1 (diff) | |
download | openbsd-47eb97a22f4397f7e4d7b37419d4c88e805cf71b.tar.gz openbsd-47eb97a22f4397f7e4d7b37419d4c88e805cf71b.tar.bz2 openbsd-47eb97a22f4397f7e4d7b37419d4c88e805cf71b.zip |
ssl3_init_finished_mac() calls BIO_new() which can fail since it in turn
calls malloc(). Instead of silently continuing on failure, check the return
value of BIO_new() and propagate failure back to the caller for appropriate
handling.
ok bcook@
Diffstat (limited to 'src/lib/libssl/d1_clnt.c')
-rw-r--r-- | src/lib/libssl/d1_clnt.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/lib/libssl/d1_clnt.c b/src/lib/libssl/d1_clnt.c index a73995ccda..490e2849f1 100644 --- a/src/lib/libssl/d1_clnt.c +++ b/src/lib/libssl/d1_clnt.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: d1_clnt.c,v 1.39 2014/12/06 14:24:26 jsing Exp $ */ | 1 | /* $OpenBSD: d1_clnt.c,v 1.40 2014/12/10 15:43:31 jsing Exp $ */ |
2 | /* | 2 | /* |
3 | * DTLS implementation written by Nagendra Modadugu | 3 | * DTLS implementation written by Nagendra Modadugu |
4 | * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. | 4 | * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. |
@@ -310,7 +310,10 @@ dtls1_connect(SSL *s) | |||
310 | s->shutdown = 0; | 310 | s->shutdown = 0; |
311 | 311 | ||
312 | /* every DTLS ClientHello resets Finished MAC */ | 312 | /* every DTLS ClientHello resets Finished MAC */ |
313 | ssl3_init_finished_mac(s); | 313 | if (!ssl3_init_finished_mac(s)) { |
314 | ret = -1; | ||
315 | goto end; | ||
316 | } | ||
314 | 317 | ||
315 | dtls1_start_timer(s); | 318 | dtls1_start_timer(s); |
316 | ret = dtls1_client_hello(s); | 319 | ret = dtls1_client_hello(s); |