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/ssl_locl.h | |
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/ssl_locl.h')
-rw-r--r-- | src/lib/libssl/ssl_locl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h index b94249e9db..322caea87f 100644 --- a/src/lib/libssl/ssl_locl.h +++ b/src/lib/libssl/ssl_locl.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_locl.h,v 1.80 2014/12/10 15:36:47 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_locl.h,v 1.81 2014/12/10 15:43:31 jsing Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -595,7 +595,7 @@ STACK_OF(SSL_CIPHER) *ssl_get_ciphers_by_id(SSL *s); | |||
595 | int ssl_verify_alarm_type(long type); | 595 | int ssl_verify_alarm_type(long type); |
596 | void ssl_load_ciphers(void); | 596 | void ssl_load_ciphers(void); |
597 | 597 | ||
598 | void ssl3_init_finished_mac(SSL *s); | 598 | int ssl3_init_finished_mac(SSL *s); |
599 | int ssl3_send_server_certificate(SSL *s); | 599 | int ssl3_send_server_certificate(SSL *s); |
600 | int ssl3_send_newsession_ticket(SSL *s); | 600 | int ssl3_send_newsession_ticket(SSL *s); |
601 | int ssl3_send_cert_status(SSL *s); | 601 | int ssl3_send_cert_status(SSL *s); |