diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-04-22 15:45:08 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-04-22 15:45:08 -0700 |
commit | 33e4ec89d9aeb5f1f828fcefba8c930f4cfa0da0 (patch) | |
tree | 85c17e2b5badc051c4a786d860ecd49d3be1edc2 /git-compat-util.h | |
parent | Merge branch 'ky/imap-send' (diff) | |
parent | configure: remove checking for HMAC_CTX_cleanup (diff) | |
download | tgif-33e4ec89d9aeb5f1f828fcefba8c930f4cfa0da0.tar.xz |
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.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 |