root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Don't core dump when using CMAC with dgst. 

We can't unfortunately print the CMAC cipher used without extending the API.

PR#2579
This commit is contained in:
Dr. Stephen Henson 2014-06-29 23:25:59 +01:00
parent 6e6ba36d98
commit 90c1946e7a
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apps/dgst.c
View File

@ -529,7 +529,8 @@ int MAIN(int argc, char **argv)
EVP_PKEY_asn1_get0_info(NULL, NULL, EVP_PKEY_asn1_get0_info(NULL, NULL,
NULL, NULL, &sig_name, ameth); NULL, NULL, &sig_name, ameth);
} }
md_name = EVP_MD_name(md); if (md)
md_name = EVP_MD_name(md);
} }
err = 0; err = 0;
for (i=0; i<argc; i++) for (i=0; i<argc; i++)
@ -641,7 +642,12 @@ int do_fp(BIO *out, unsigned char *buf, BIO *bp, int sep, int binout,
else else
{ {
if (sig_name) if (sig_name)
BIO_printf(out, "%s-%s(%s)= ", sig_name, md_name, file); {
BIO_puts(out, sig_name);
if (md_name)
BIO_printf(out, "-%s", md_name);
BIO_printf(out, "(%s)= ", file);
}
else if (md_name) else if (md_name)
BIO_printf(out, "%s(%s)= ", md_name, file); BIO_printf(out, "%s(%s)= ", md_name, file);
else else