diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-05-07 00:53:24 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-05-07 00:53:24 +0300 |
commit | a0c9cf51c0ba6ca30f7325bc035200010f2c50f7 (patch) | |
tree | bf0c43cc8490b45e7cd753f1ec1254265f9506ff /git-compat-util.h | |
parent | 8854ded7af794c10cc68957dbdd4c636811b97fa (diff) | |
parent | 1245c74936d5803415306ade3c5050614a26af4e (diff) |
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 'git-compat-util.h')
-rw-r--r-- | git-compat-util.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/git-compat-util.h b/git-compat-util.h index 474395471f..1f8b5f3b1f 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -279,9 +279,6 @@ extern char *gitdirname(char *); #endif #include <openssl/ssl.h> #include <openssl/err.h> -#ifdef NO_HMAC_CTX_CLEANUP -#define HMAC_CTX_cleanup HMAC_cleanup -#endif #endif /* On most systems <netdb.h> would have given us this, but |