diff options
| author |   miod <miod@openbsd.org> | 2014-06-18 04:50:44 +0000 |
|---|---|---|
| committer | miod <miod@openbsd.org> | 2014-06-18 04:50:44 +0000 |
| commit | d5adf85e54323c3271c74256f2a5af155575f350 (patch) | |
| tree | 82c6db26e519c6291645e6ae392bb03903a18002 /lib/libssl/src/ssl/s3_enc.c | |
| parent | Make sure to always invoke EVP_CIPHER_CTX_cleanup() before returning in the (diff) | |
| download | wireguard-openbsd-d5adf85e54323c3271c74256f2a5af155575f350.tar.xz wireguard-openbsd-d5adf85e54323c3271c74256f2a5af155575f350.zip | |
Missinc calloc() return value check; ok deraadt@
Diffstat (limited to 'lib/libssl/src/ssl/s3_enc.c')
| -rw-r--r-- | lib/libssl/src/ssl/s3_enc.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/libssl/src/ssl/s3_enc.c b/lib/libssl/src/ssl/s3_enc.c index 6170b553f0c..dfb4c283f1e 100644 --- a/lib/libssl/src/ssl/s3_enc.c +++ b/lib/libssl/src/ssl/s3_enc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: s3_enc.c,v 1.49 2014/06/15 15:29:25 jsing Exp $ */ +/* $OpenBSD: s3_enc.c,v 1.50 2014/06/18 04:50:44 miod Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -608,6 +608,10 @@ ssl3_digest_cached_records(SSL *s) ssl3_free_digest_list(s); s->s3->handshake_dgst = calloc(SSL_MAX_DIGEST, sizeof(EVP_MD_CTX *)); + if (s->s3->handshake_dgst == NULL) { + SSLerr(SSL_F_SSL3_DIGEST_CACHED_RECORDS, ERR_R_MALLOC_FAILURE); + return 0; + } hdatalen = BIO_get_mem_data(s->s3->handshake_buffer, &hdata); if (hdatalen <= 0) { SSLerr(SSL_F_SSL3_DIGEST_CACHED_RECORDS, |