]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ky/imap-send-openssl-1.1.0' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 6 May 2016 21:53:24 +0000 (14:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 6 May 2016 21:53:24 +0000 (14:53 -0700)
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

1  2 
Makefile
configure.ac
git-compat-util.h
imap-send.c

diff --cc Makefile
Simple merge
diff --cc configure.ac
Simple merge
Simple merge
diff --cc imap-send.c
Simple merge