diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-05-06 14:53:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-05-06 14:53:24 -0700 |
| commit | a0c9cf51c0ba6ca30f7325bc035200010f2c50f7 (patch) | |
| tree | bf0c43cc8490b45e7cd753f1ec1254265f9506ff /t/t6037-merge-ours-theirs.sh | |
| parent | Merge branch 'js/replace-edit-use-editor-configuration' into maint (diff) | |
| parent | configure: remove checking for HMAC_CTX_cleanup (diff) | |
| download | tgif-a0c9cf51c0ba6ca30f7325bc035200010f2c50f7.tar.xz | |
Merge branch 'ky/imap-send-openssl-1.1.0' into maint
Upcoming OpenSSL 1.1.0 will break compilation b updating a few APIs
we use in imap-send, which has been adjusted for the change.
* ky/imap-send-openssl-1.1.0:
configure: remove checking for HMAC_CTX_cleanup
imap-send: avoid deprecated TLSv1_method()
imap-send: check NULL return of SSL_CTX_new()
imap-send: use HMAC() function provided by OpenSSL
Diffstat (limited to 't/t6037-merge-ours-theirs.sh')
0 files changed, 0 insertions, 0 deletions