diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-01-27 10:44:34 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-01-27 10:44:34 -0800 |
| commit | de20e4472157d0ed53bdc6374185a2ce3c7c9f3d (patch) | |
| tree | 365e5ad12a64158b356b58418ffdb55edb70931e | |
| parent | Merge branch 'jn/ignore-doc' (diff) | |
| parent | send-email: /etc/ssl/certs/ directory may not be usable as ca_path (diff) | |
| download | tgif-de20e4472157d0ed53bdc6374185a2ce3c7c9f3d.tar.xz | |
Merge branch 'rk/send-email-ssl-cert'
The "if /etc/ssl/certs/ directory exists, explicitly telling the
library to use it as SSL_ca_path" blind-defaulting in "git
send-email" broke platforms where /etc/ssl/certs/ directory exists,
but it cannot used as SSL_ca_path (e.g. Fedora rawhide). Fix it by
not specifying any SSL_ca_path/SSL_ca_file but still asking for peer
verification in such a case.
* rk/send-email-ssl-cert:
send-email: /etc/ssl/certs/ directory may not be usable as ca_path
| -rwxr-xr-x | git-send-email.perl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/git-send-email.perl b/git-send-email.perl index 2016d9c619..fdb0029b59 100755 --- 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 "") { |