michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-02-03 14:13:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fail more gracefully if SSL cert cannot be loaded

Browse Source
This commit is contained in:
Jamie Cameron
2020-12-06 21:31:27 -08:00
parent d7f3e8053e
commit 8a34f7b6a7
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
miniserv.pl
View File

@@ -4510,12 +4510,16 @@ foreach my $p (@extracas) {
Net::SSLeay::CTX_load_verify_locations($ssl_ctx, $p, "");
}
Net::SSLeay::CTX_use_PrivateKey_file(
$ssl_ctx, $keyfile,
&Net::SSLeay::FILETYPE_PEM) || die "Failed to open SSL key $keyfile";
Net::SSLeay::CTX_use_certificate_file(
$ssl_ctx, $certfile || $keyfile,
&Net::SSLeay::FILETYPE_PEM) || die "Failed to open SSL cert $certfile";
if (!Net::SSLeay::CTX_use_PrivateKey_file($ssl_ctx, $keyfile,
&Net::SSLeay::FILETYPE_PEM)) {
print STDERR "Failed to open SSL key $keyfile\n";
return undef;
}
if (!Net::SSLeay::CTX_use_certificate_file($ssl_ctx, $certfile || $keyfile,
&Net::SSLeay::FILETYPE_PEM)) {
print STDERR "Failed to open SSL cert $certfile\n";
return undef;
}
if ($config{'no_ssl2'}) {
eval 'Net::SSLeay::CTX_set_options($ssl_ctx,