Skip to content

Commit 5183d92

Browse files
authored
Merge pull request #1112 from ikedas/issue-1110 by ikedas
bulk.pl daemon crashes if it failed to load private key (#1110)
2 parents 1622284 + 4088157 commit 5183d92

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

src/lib/Sympa/Message.pm

+10-2
Original file line numberDiff line numberDiff line change
@@ -1236,9 +1236,17 @@ sub smime_sign {
12361236
my $smime = Crypt::SMIME->new();
12371237
#FIXME: Add intermediate CA certificates if any.
12381238
if (length $key_passwd) {
1239-
$smime->setPrivateKey($key, $cert, $key_passwd);
1239+
unless (eval { $smime->setPrivateKey($key, $cert, $key_passwd) }) {
1240+
$log->syslog('err', 'Unable to S/MIME sign message: %s',
1241+
$EVAL_ERROR);
1242+
return undef;
1243+
}
12401244
} else {
1241-
$smime->setPrivateKey($key, $cert);
1245+
unless (eval { $smime->setPrivateKey($key, $cert) }) {
1246+
$log->syslog('err', 'Unable to S/MIME sign message: %s',
1247+
$EVAL_ERROR);
1248+
return undef;
1249+
}
12421250
}
12431251
my $msg_string = eval {
12441252
$smime->sign($dup_head->as_string . "\n" . $self->body_as_string);

0 commit comments

Comments
 (0)