Merge branch 'rk/send-email-ssl-cert' into maint

gitster · gitster · commit 7c9b668b83c6 · 2014-02-13T13:38:19.000-08:00
A recent update to "git send-email" broke platforms where
/etc/ssl/certs/ directory exists but cannot be used as SSL_ca_path
(e.g. Fedora rawhide).

* rk/send-email-ssl-cert:
  send-email: /etc/ssl/certs/ directory may not be usable as ca_path
diff --git a/git-send-email.perl b/git-send-email.perl
@@ -1095,7 +1095,8 @@ sub ssl_verify_params {
 	}
 
 	if (!defined $smtp_ssl_cert_path) {
-		$smtp_ssl_cert_path = "/etc/ssl/certs";
+		# use the OpenSSL defaults
+		return (SSL_verify_mode => SSL_VERIFY_PEER());
 	}
 
 	if ($smtp_ssl_cert_path eq "") {

Original file line number	Diff line number	Diff line change
`@@ -1095,7 +1095,8 @@ sub ssl_verify_params {`
`1095`	`1095`	`}`
`1096`	`1096`
`1097`	`1097`	`if (!defined $smtp_ssl_cert_path) {`
`1098`		`- $smtp_ssl_cert_path = "/etc/ssl/certs";`
	`1098`	`+ # use the OpenSSL defaults`
	`1099`	`+ return (SSL_verify_mode => SSL_VERIFY_PEER());`
`1099`	`1100`	`}`
`1100`	`1101`
`1101`	`1102`	`if ($smtp_ssl_cert_path eq "") {`