summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2015-12-01 23:54:54 (GMT)
committerJeff King <peff@peff.net>2015-12-01 23:54:54 (GMT)
commit43ed3827ed5ce06692d02e0f0c6809ff5812bb6e (patch)
treefb46c9d00c38514e96ed83d38b52899a560eac00
parente2187fe520057ccf3021e642de3a770790e9baae (diff)
parentc55d65f3c524ab2cb40e2293343eb28a0ee0fe46 (diff)
downloadgit-43ed3827ed5ce06692d02e0f0c6809ff5812bb6e.zip
git-43ed3827ed5ce06692d02e0f0c6809ff5812bb6e.tar.gz
git-43ed3827ed5ce06692d02e0f0c6809ff5812bb6e.tar.bz2
Merge branch 'jk/send-email-ca-path'
Use a safer behavior when we hit errors verifying remote certificates. * jk/send-email-ca-path: send-email: die if CA path doesn't exist
-rwxr-xr-xgit-send-email.perl3
1 files changed, 1 insertions, 2 deletions
diff --git a/git-send-email.perl b/git-send-email.perl
index 719c715..77cc2cc 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -1196,8 +1196,7 @@ sub ssl_verify_params {
return (SSL_verify_mode => SSL_VERIFY_PEER(),
SSL_ca_file => $smtp_ssl_cert_path);
} else {
- print STDERR "Not using SSL_VERIFY_PEER because the CA path does not exist.\n";
- return (SSL_verify_mode => SSL_VERIFY_NONE());
+ die "CA path \"$smtp_ssl_cert_path\" does not exist";
}
}