Skip to content

Commit ac0835f

Browse files
committed
Merge branch 'tr/send-email-ssl' into maint
SSL-related options were not passed correctly to underlying socket layer in "git send-email". * tr/send-email-ssl: send-email: set SSL options through IO::Socket::SSL::set_client_defaults send-email: --smtp-ssl-cert-path takes an argument send-email: pass Debug to Net::SMTP::SSL::new
2 parents 1a11195 + 5508f3e commit ac0835f

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

git-send-email.perl

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ sub signal_handler {
291291
"smtp-pass:s" => \$smtp_authpass,
292292
"smtp-ssl" => sub { $smtp_encryption = 'ssl' },
293293
"smtp-encryption=s" => \$smtp_encryption,
294-
"smtp-ssl-cert-path" => \$smtp_ssl_cert_path,
294+
"smtp-ssl-cert-path=s" => \$smtp_ssl_cert_path,
295295
"smtp-debug:i" => \$debug_net_smtp,
296296
"smtp-domain:s" => \$smtp_domain,
297297
"identity=s" => \$identity,
@@ -1214,10 +1214,14 @@ sub send_message {
12141214
$smtp_server_port ||= 465; # ssmtp
12151215
require Net::SMTP::SSL;
12161216
$smtp_domain ||= maildomain();
1217+
require IO::Socket::SSL;
1218+
# Net::SMTP::SSL->new() does not forward any SSL options
1219+
IO::Socket::SSL::set_client_defaults(
1220+
ssl_verify_params());
12171221
$smtp ||= Net::SMTP::SSL->new($smtp_server,
12181222
Hello => $smtp_domain,
12191223
Port => $smtp_server_port,
1220-
ssl_verify_params());
1224+
Debug => $debug_net_smtp);
12211225
}
12221226
else {
12231227
require Net::SMTP;

0 commit comments

Comments
 (0)