Don't access EVP_MD_CTX internals directly.

(cherry picked from commit 04e45b52ee3be81121359cc1198fd01e38096e9f)

diff --git a/ssl/s3_cbc.c b/ssl/s3_cbc.c
index da53a6da3b735fceeeda6d3942d085704580b8eb..52e294157eba276a8372faaf351d30a4497439a1 100644 (file)
--- a/ssl/s3_cbc.c
+++ b/ssl/s3_cbc.c
@@ -379,7 +379,7 @@ char ssl3_cbc_record_digest_supported(const EVP_MD_CTX *ctx)
        if (FIPS_mode())
                return 0;
 #endif
        if (FIPS_mode())
                return 0;
 #endif

-       switch (ctx->digest->type)
+       switch (EVP_MD_CTX_type(ctx))

                {
                case NID_md5:
                case NID_sha1:
                {
                case NID_md5:
                case NID_sha1:


@@ -452,7 +452,7 @@ void ssl3_cbc_digest_record(
         * many possible overflows later in this function. */
        OPENSSL_assert(data_plus_mac_plus_padding_size < 1024*1024);
 
         * many possible overflows later in this function. */
        OPENSSL_assert(data_plus_mac_plus_padding_size < 1024*1024);
 

-       switch (ctx->digest->type)
+       switch (EVP_MD_CTX_type(ctx))

                {
                case NID_md5:
                        MD5_Init((MD5_CTX*)md_state.c);
                {
                case NID_md5:
                        MD5_Init((MD5_CTX*)md_state.c);