From: Richard Levitte <levitte@openssl.org>
Date: Sun, 29 Nov 2015 19:12:35 +0000 (+0100)
Subject: Have the few apps that accessed EVP_MD directly use accessors instead
X-Git-Tag: OpenSSL_1_1_0-pre1~114
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=cc9d6655a1e6562564a0ac4b5dfcd72f24de7063;p=oweals%2Fopenssl.git

Have the few apps that accessed EVP_MD directly use accessors instead

Reviewed-by: Rich Salz <rsalz@openssl.org>
---

diff --git a/apps/ca.c b/apps/ca.c
index eea9d99cb4..f6ba23926b 100644
--- a/apps/ca.c
+++ b/apps/ca.c
@@ -828,7 +828,7 @@ end_of_options:
         }
         if (verbose)
             BIO_printf(bio_err, "message digest is %s\n",
-                       OBJ_nid2ln(dgst->type));
+                       OBJ_nid2ln(EVP_MD_type(dgst)));
         if ((policy == NULL) && ((policy = NCONF_get_string(conf,
                                                             section,
                                                             ENV_POLICY)) ==
diff --git a/apps/speed.c b/apps/speed.c
index c90729c805..1434a95ba9 100644
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -1687,7 +1687,7 @@ int speed_main(int argc, char **argv)
                 EVP_CIPHER_CTX_cleanup(&ctx);
             }
             if (evp_md) {
-                names[D_EVP] = OBJ_nid2ln(evp_md->type);
+                names[D_EVP] = OBJ_nid2ln(EVP_MD_type(evp_md));
                 print_message(names[D_EVP], save_count, lengths[j]);
 
                 Time_F(START);