Merge from stable branch.

This commit is contained in:
Dr. Stephen Henson
2008-06-14 19:53:04 +00:00
parent 18ab306e63
commit e9d247d2b0
155 changed files with 15577 additions and 5441 deletions

View File

@@ -719,8 +719,7 @@ bad:
message */
goto end;
}
if (EVP_PKEY_type(pkey->type) == EVP_PKEY_DSA ||
EVP_PKEY_type(pkey->type) == EVP_PKEY_EC)
else
{
char *randfile = NCONF_get_string(req_conf,SECTION,"RANDFILE");
if (randfile == NULL)