Cleanup: fix all sources that used EVP_MD_CTX_(create|init|destroy)

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

3 files changed, 13 insertions, 13 deletions

diff --git a/apps/passwd.c b/apps/passwd.c
index 70ecb874ef..2a32111e9d 100644
--- a/apps/passwd.c
+++ b/apps/passwd.c
@@ -322,7 +322,7 @@ static char *md5crypt(const char *passwd, const char *magic, const char *salt)
     salt_len = strlen(salt_out);
     assert(salt_len <= 8);
 
-    md = EVP_MD_CTX_create();
+    md = EVP_MD_CTX_new();
     if (md == NULL)
         return NULL;
     EVP_DigestInit_ex(md, EVP_md5(), NULL);
@@ -332,7 +332,7 @@ static char *md5crypt(const char *passwd, const char *magic, const char *salt)
     EVP_DigestUpdate(md, "$", 1);
     EVP_DigestUpdate(md, salt_out, salt_len);
 
-    md2 = EVP_MD_CTX_create();
+    md2 = EVP_MD_CTX_new();
     if (md2 == NULL)
         return NULL;
     EVP_DigestInit_ex(md2, EVP_md5(), NULL);
@@ -364,8 +364,8 @@ static char *md5crypt(const char *passwd, const char *magic, const char *salt)
                          (i & 1) ? sizeof buf : passwd_len);
         EVP_DigestFinal_ex(md2, buf, NULL);
     }
-    EVP_MD_CTX_destroy(md2);
-    EVP_MD_CTX_destroy(md);
+    EVP_MD_CTX_free(md2);
+    EVP_MD_CTX_free(md);
 
     {
         /* transform buf into output string */
diff --git a/apps/req.c b/apps/req.c
index 267a0a025a..c275763932 100644
--- a/apps/req.c
+++ b/apps/req.c
@@ -1511,7 +1511,7 @@ int do_X509_sign(X509 *x, EVP_PKEY *pkey, const EVP_MD *md,
                  STACK_OF(OPENSSL_STRING) *sigopts)
 {
     int rv;
-    EVP_MD_CTX *mctx = EVP_MD_CTX_create();
+    EVP_MD_CTX *mctx = EVP_MD_CTX_new();
 
     rv = do_sign_init(mctx, pkey, md, sigopts);
     /* Note: X509_sign_ctx() calls ASN1_item_sign_ctx(), which destroys
@@ -1520,7 +1520,7 @@ int do_X509_sign(X509 *x, EVP_PKEY *pkey, const EVP_MD *md,
     if (rv > 0)
         rv = X509_sign_ctx(x, mctx);
     else
-        EVP_MD_CTX_destroy(mctx);
+        EVP_MD_CTX_free(mctx);
     return rv > 0 ? 1 : 0;
 }
 
@@ -1528,7 +1528,7 @@ int do_X509_REQ_sign(X509_REQ *x, EVP_PKEY *pkey, const EVP_MD *md,
                      STACK_OF(OPENSSL_STRING) *sigopts)
 {
     int rv;
-    EVP_MD_CTX *mctx = EVP_MD_CTX_create();
+    EVP_MD_CTX *mctx = EVP_MD_CTX_new();
     rv = do_sign_init(mctx, pkey, md, sigopts);
     /* Note: X509_REQ_sign_ctx() calls ASN1_item_sign_ctx(), which destroys
      * the EVP_MD_CTX we send it, so only destroy it here if the former
@@ -1536,7 +1536,7 @@ int do_X509_REQ_sign(X509_REQ *x, EVP_PKEY *pkey, const EVP_MD *md,
     if (rv > 0)
         rv = X509_REQ_sign_ctx(x, mctx);
     else
-        EVP_MD_CTX_destroy(mctx);
+        EVP_MD_CTX_free(mctx);
     return rv > 0 ? 1 : 0;
 }
 
@@ -1544,7 +1544,7 @@ int do_X509_CRL_sign(X509_CRL *x, EVP_PKEY *pkey, const EVP_MD *md,
                      STACK_OF(OPENSSL_STRING) *sigopts)
 {
     int rv;
-    EVP_MD_CTX *mctx = EVP_MD_CTX_create();
+    EVP_MD_CTX *mctx = EVP_MD_CTX_new();
     rv = do_sign_init(mctx, pkey, md, sigopts);
     /* Note: X509_CRL_sign_ctx() calls ASN1_item_sign_ctx(), which destroys
      * the EVP_MD_CTX we send it, so only destroy it here if the former
@@ -1552,6 +1552,6 @@ int do_X509_CRL_sign(X509_CRL *x, EVP_PKEY *pkey, const EVP_MD *md,
     if (rv > 0)
         rv = X509_CRL_sign_ctx(x, mctx);
     else
-        EVP_MD_CTX_destroy(mctx);
+        EVP_MD_CTX_free(mctx);
     return rv > 0 ? 1 : 0;
 }
diff --git a/apps/ts.c b/apps/ts.c
index 4da61d422c..00b5e53f7c 100644
--- a/apps/ts.c
+++ b/apps/ts.c
@@ -523,7 +523,7 @@ static int create_digest(BIO *input, char *digest, const EVP_MD *md,
         return 0;
 
     if (input) {
-        EVP_MD_CTX *md_ctx = EVP_MD_CTX_create();
+        EVP_MD_CTX *md_ctx = EVP_MD_CTX_new();
         unsigned char buffer[4096];
         int length;
 
@@ -535,10 +535,10 @@ static int create_digest(BIO *input, char *digest, const EVP_MD *md,
             EVP_DigestUpdate(md_ctx, buffer, length);
         }
         if (!EVP_DigestFinal(md_ctx, *md_value, NULL)) {
-            EVP_MD_CTX_destroy(md_ctx);
+            EVP_MD_CTX_free(md_ctx);
             return 0;
         }
-        EVP_MD_CTX_destroy(md_ctx);
+        EVP_MD_CTX_free(md_ctx);
     } else {
         long digest_len;
         *md_value = string_to_hex(digest, &digest_len);