Commit ea32151f 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 1d00db6b

ssl/s3_enc.c

+4 −5
Original line number Diff line number Diff line
@@ -374,14 +374,13 @@ int ssl3_digest_cached_records(SSL *s, int keep) 
        }



        md = ssl_handshake_md(s);

        if (md == NULL) {

        if (   md == NULL

            || !EVP_DigestInit_ex(s->s3->handshake_dgst, md, NULL)

            || !EVP_DigestUpdate(s->s3->handshake_dgst, hdata, hdatalen))

        {

            SSLerr(SSL_F_SSL3_DIGEST_CACHED_RECORDS, ERR_R_INTERNAL_ERROR);

            return 0;

        }



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

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



    }

    if (keep == 0) {

        BIO_free(s->s3->handshake_buffer);