generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use the default_md config file value when signing CRLs.

Browse Source 
PR:662
This commit is contained in:
Dr. Stephen Henson 2004-11-11 13:46:44 +00:00
parent 9262f5a3fa
commit 4ae135eb0d
1 changed files with 15 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
apps/ca.c
View File

@ -994,25 +994,27 @@ bad:
} }
} }
if ((md == NULL) && ((md=NCONF_get_string(conf,
section,ENV_DEFAULT_MD)) == NULL))
{
lookup_fail(section,ENV_DEFAULT_MD);
goto err;
}
if ((dgst=EVP_get_digestbyname(md)) == NULL)
{
BIO_printf(bio_err,"%s is an unsupported message digest type\n",md);
goto err;
}
if (req) if (req)
{ {
if ((md == NULL) && ((md=NCONF_get_string(conf,
section,ENV_DEFAULT_MD)) == NULL))
{
lookup_fail(section,ENV_DEFAULT_MD);
goto err;
}
if ((email_dn == 1) && ((tmp_email_dn=NCONF_get_string(conf, if ((email_dn == 1) && ((tmp_email_dn=NCONF_get_string(conf,
section,ENV_DEFAULT_EMAIL_DN)) != NULL )) section,ENV_DEFAULT_EMAIL_DN)) != NULL ))
{ {
if(strcmp(tmp_email_dn,"no") == 0) if(strcmp(tmp_email_dn,"no") == 0)
email_dn=0; email_dn=0;
} }
if ((dgst=EVP_get_digestbyname(md)) == NULL)
{
BIO_printf(bio_err,"%s is an unsupported message digest type\n",md);
goto err;
}
if (verbose) if (verbose)
BIO_printf(bio_err,"message digest is %s\n", BIO_printf(bio_err,"message digest is %s\n",
OBJ_nid2ln(dgst->type)); OBJ_nid2ln(dgst->type));
@ -1395,23 +1397,10 @@ bad:
/* we now have a CRL */ /* we now have a CRL */
if (verbose) BIO_printf(bio_err,"signing CRL\n"); if (verbose) BIO_printf(bio_err,"signing CRL\n");
if (md != NULL)
{
if ((dgst=EVP_get_digestbyname(md)) == NULL)
{
BIO_printf(bio_err,"%s is an unsupported message digest type\n",md);
goto err;
}
}
else
{
#ifndef OPENSSL_NO_DSA #ifndef OPENSSL_NO_DSA
if (pkey->type == EVP_PKEY_DSA) if (pkey->type == EVP_PKEY_DSA)
dgst=EVP_dss1(); dgst=EVP_dss1();
else
#endif #endif
dgst=EVP_md5();
}
/* Add any extensions asked for */ /* Add any extensions asked for */