summaryrefslogtreecommitdiff
path: root/git-compat-util.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-04-22 15:45:08 -0700
committerJunio C Hamano <gitster@pobox.com>2016-04-22 15:45:08 -0700
commit33e4ec89d9aeb5f1f828fcefba8c930f4cfa0da0 (patch)
tree85c17e2b5badc051c4a786d860ecd49d3be1edc2 /git-compat-util.h
parent886c76d0215ce503a5370bfcbe84dccead41fee0 (diff)
parent1245c74936d5803415306ade3c5050614a26af4e (diff)
downloadgit-33e4ec89d9aeb5f1f828fcefba8c930f4cfa0da0.tar.gz
Merge branch 'ky/imap-send-openssl-1.1.0'
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.h3
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