don't try to load cert/key when the "-nocert" option is set

This commit is contained in:
Nils Larsch 2005-09-02 12:27:02 +00:00
parent 7f622f6c04
commit 3b2ba5f7fb

View File

@ -832,21 +832,24 @@ bad:
if (s_key_file == NULL) if (s_key_file == NULL)
s_key_file = s_cert_file; s_key_file = s_cert_file;
s_key = load_key(bio_err, s_key_file, s_key_format, 0, pass, e, if (nocert == 0)
"server certificate private key file");
if (!s_key)
{ {
ERR_print_errors(bio_err); s_key = load_key(bio_err, s_key_file, s_key_format, 0, pass, e,
goto end; "server certificate private key file");
} if (!s_key)
{
ERR_print_errors(bio_err);
goto end;
}
s_cert = load_cert(bio_err,s_cert_file,s_cert_format, s_cert = load_cert(bio_err,s_cert_file,s_cert_format,
NULL, e, "server certificate file"); NULL, e, "server certificate file");
if (!s_cert) if (!s_cert)
{ {
ERR_print_errors(bio_err); ERR_print_errors(bio_err);
goto end; goto end;
}
} }
if (s_dcert_file) if (s_dcert_file)