Use default md if none specified in dgst utility. (f03620ea) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP OpenSSL

apps/dgst.c

+16 −6

Original line number	Diff line number	Diff line
		@@ -231,8 +231,6 @@ int MAIN(int argc, char **argv)
		argv++;
		}

		if (md == NULL)
		md=EVP_md5();

		if(do_verify && !sigfile) {
		BIO_printf(bio_err, "No signature to verify: use the -signature option\n");
		@@ -447,12 +445,17 @@ int MAIN(int argc, char **argv)
		}
		}
		/* we use md as a filter, reading from 'in' */
		else if (!BIO_set_md(bmd,md))
		else
		{
		if (md == NULL)
		md = EVP_md5();
		if (!BIO_set_md(bmd,md))
		{
		BIO_printf(bio_err, "Error setting digest %s\n", pname);
		ERR_print_errors(bio_err);
		goto end;
		}
		}

		if(sigfile && sigkey) {
		BIO *sigbio;
		@@ -476,6 +479,13 @@ int MAIN(int argc, char **argv)
		}
		inp=BIO_push(bmd,in);

		if (md == NULL)
		{
		EVP_MD_CTX *tctx;
		BIO_get_md_ctx(bmd, &tctx);
		md = EVP_MD_CTX_md(tctx);
		}

		if (argc == 0)
		{
		BIO_set_fp(in,stdin,BIO_NOCLOSE);