Fix -pkeyopt and fix error check.

[openssl.git] / apps / ts.c

diff --git a/apps/ts.c b/apps/ts.c
index 4da61d422cb2aa903770c1cfff20d8aa58cbf7d3..ee04bb5ad8b3144b26f399c10239361bd8873be8 100644 (file)
--- a/apps/ts.c
+++ b/apps/ts.c
@@ -299,7 +299,6 @@ int ts_main(int argc, char **argv)
         }
     }
     argc = opt_num_rest();
-    argv = opt_rest();
     if (mode == OPT_ERR || argc != 0)
         goto opthelp;
 
@@ -523,7 +522,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 +534,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);