Commit ada5de7c authored by Matt Caswell's avatar Matt Caswell
Browse files

The ssl3_digest_cached_records() function does not handle errors properly 



The ssl3_digest_cached_records() function was failing to handle errors
that might be returned from EVP_DigestSignInit() and
EVP_DigestSignUpdate().

RT#4180

Reviewed-by: default avatarStephen Henson <steve@openssl.org>
parent 649af484

ssl/s3_enc.c

+6 −2
Original line number Diff line number Diff line
@@ -624,8 +624,12 @@ int ssl3_digest_cached_records(SSL *s) 
                                     EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);

            }

#endif

            EVP_DigestInit_ex(s->s3->handshake_dgst[i], md, NULL);

            EVP_DigestUpdate(s->s3->handshake_dgst[i], hdata, hdatalen);

            if (!EVP_DigestInit_ex(s->s3->handshake_dgst[i], md, NULL)

                || !EVP_DigestUpdate(s->s3->handshake_dgst[i], hdata,

                                     hdatalen)) {

                SSLerr(SSL_F_SSL3_DIGEST_CACHED_RECORDS, ERR_R_INTERNAL_ERROR);

                return 0;

            }

        } else {

            s->s3->handshake_dgst[i] = NULL;

        }