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 eea9d99cb49339cc7662572ec7b2c04bbbdeac2a..f6ba23926bb73b16a9b95ba13b2ebd5ef3be0b5e 100644 (file)
--- 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",
         }
         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)) ==
         if ((policy == NULL) && ((policy = NCONF_get_string(conf,
                                                             section,
                                                             ENV_POLICY)) ==

diff --git a/apps/speed.c b/apps/speed.c
index c90729c80594d766e0e0c129e08a88fafe73e1b3..1434a95ba9e255eac9b031eae7fc28663751808d 100644 (file)
--- 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) {
                 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);
                 print_message(names[D_EVP], save_count, lengths[j]);
 
                 Time_F(START);