projects
/
oweals
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
11ed851
)
Fix some malloc failure crashes on X509_STORE_CTX_set_ex_data
author
FdaSilvaYY
<fdasilvayy@gmail.com>
Sat, 13 Feb 2016 18:01:14 +0000
(19:01 +0100)
committer
Matt Caswell
<matt@openssl.org>
Mon, 23 May 2016 12:42:37 +0000
(13:42 +0100)
from BoringSSL
306ece31bcaaed49e0240a2e5555f8901ebb2d45
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
ssl/ssl_cert.c
patch
|
blob
|
history
diff --git
a/ssl/ssl_cert.c
b/ssl/ssl_cert.c
index f285fbe88255e79f45f7ac837ba785bfc6f01f69..7481705ed03ca2788151b2ad0205ba1eae16b31d 100644
(file)
--- a/
ssl/ssl_cert.c
+++ b/
ssl/ssl_cert.c
@@
-409,7
+409,9
@@
int ssl_verify_cert_chain(SSL *s, STACK_OF(X509) *sk)
/* Set suite B flags if needed */
X509_STORE_CTX_set_flags(ctx, tls1_suiteb(s));
- X509_STORE_CTX_set_ex_data(ctx, SSL_get_ex_data_X509_STORE_CTX_idx(), s);
+ if (!X509_STORE_CTX_set_ex_data(ctx, SSL_get_ex_data_X509_STORE_CTX_idx(), s)) {
+ goto end;
+ }
/* Verify via DANE if enabled */
if (DANETLS_ENABLED(&s->dane))