Merge branch 'jk/send-email-ca-path'

peff · peff · commit 43ed3827ed5c · 2015-12-01T18:54:54.000-05:00
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
diff --git 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";
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1196,8 +1196,7 @@ sub ssl_verify_params {`
`1196`	`1196`	`return (SSL_verify_mode => SSL_VERIFY_PEER(),`
`1197`	`1197`	`SSL_ca_file => $smtp_ssl_cert_path);`
`1198`	`1198`	`} else {`
`1199`		`- print STDERR "Not using SSL_VERIFY_PEER because the CA path does not exist.\n";`
`1200`		`- return (SSL_verify_mode => SSL_VERIFY_NONE());`
	`1199`	`+ die "CA path \"$smtp_ssl_cert_path\" does not exist";`
`1201`	`1200`	`}`
`1202`	`1201`	`}`
`1203`	`1202`