git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Reuben Hawkins <reubenhwk@gmail.com>
To: git@vger.kernel.org
Cc: Reuben Hawkins <reubenhwk@gmail.com>
Subject: [PATCH 3/3] configure.ac: check for HMAC_CTX_cleanup
Date: Wed,  7 Jan 2015 12:23:56 -0800	[thread overview]
Message-ID: <1420662236-27593-4-git-send-email-reubenhwk@gmail.com> (raw)
In-Reply-To: <1420662236-27593-1-git-send-email-reubenhwk@gmail.com>

OpenSSL version 0.9.6b and before defined the function HMAC_cleanup.
Newer versions define HMAC_CTX_cleanup.  Check for HMAC_CTX_cleanup and
fall back to HMAC_cleanup when the newer function is missing.
---
 Makefile          | 3 +++
 configure.ac      | 7 +++++++
 git-compat-util.h | 3 +++
 3 files changed, 13 insertions(+)

diff --git a/Makefile b/Makefile
index af551a0..d3c2b58 100644
--- a/Makefile
+++ b/Makefile
@@ -1059,6 +1059,9 @@ ifndef NO_OPENSSL
 	ifdef NEEDS_CRYPTO_WITH_SSL
 		OPENSSL_LIBSSL += -lcrypto
 	endif
+	ifdef NO_HMAC_CTX_CLEANUP
+		BASIC_CFLAGS += -DNO_HMAC_CTX_CLEANUP
+	endif
 else
 	BASIC_CFLAGS += -DNO_OPENSSL
 	BLK_SHA1 = 1
diff --git a/configure.ac b/configure.ac
index 424dec5..c282663 100644
--- a/configure.ac
+++ b/configure.ac
@@ -923,6 +923,13 @@ AC_CHECK_LIB([iconv], [locale_charset],
                      [CHARSET_LIB=-lcharset])])
 GIT_CONF_SUBST([CHARSET_LIB])
 #
+# Define NO_HMAC_CTX_CLEANUP=YesPlease if HMAC_CTX_cleanup is missing.
+AC_CHECK_LIB([crypto], [HMAC_CTX_cleanup],
+	[NO_HMAC_CTX_CLEANUP=],
+	[NO_HMAC_CTX_CLEANUP=YesPlease],
+	[])
+GIT_CONF_SUBST([NO_HMAC_CTX_CLEANUP])
+#
 # Define HAVE_CLOCK_GETTIME=YesPlease if clock_gettime is available.
 GIT_CHECK_FUNC(clock_gettime,
 [HAVE_CLOCK_GETTIME=YesPlease],
diff --git a/git-compat-util.h b/git-compat-util.h
index 400e921..2fdca2d 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -213,6 +213,9 @@ extern char *gitbasename(char *);
 #ifndef NO_OPENSSL
 #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
-- 
2.2.0.68.g8f72f0c.dirty

  parent reply	other threads:[~2015-01-07 20:24 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-12-21 18:53 [PATCH 1/3] configure.ac: check tv_nsec field in struct stat Reuben Hawkins
2014-12-21 18:53 ` [PATCH 2/3] configure.ac,trace.c: check for CLOCK_MONOTONIC Reuben Hawkins
2014-12-21 20:54   ` Eric Sunshine
2014-12-22  4:12   ` brian m. carlson
2014-12-22 12:36     ` Reuben Hawkins
2014-12-21 18:53 ` [PATCH 3/3] configure.ac,imap-send.c: check HMAC_CTX_cleanup Reuben Hawkins
2014-12-21 21:28   ` Eric Sunshine
2015-01-07 20:23     ` v2 patches for fixes on RHEL3 Reuben Hawkins
2015-01-07 20:23       ` [PATCH 1/3] configure.ac: check tv_nsec field in struct stat Reuben Hawkins
2015-01-07 21:19         ` Eric Sunshine
2015-01-07 21:33           ` Reuben Hawkins
2015-01-07 21:57             ` Eric Sunshine
2015-01-07 22:19           ` Reuben Hawkins
2015-01-08  5:41             ` Eric Sunshine
2015-01-07 20:23       ` [PATCH 2/3] configure.ac: check for clock_gettime and CLOCK_MONOTONIC Reuben Hawkins
2015-01-07 21:37         ` Eric Sunshine
2015-01-07 22:31           ` Reuben Hawkins
2015-01-08  5:54             ` Eric Sunshine
2015-01-07 20:23       ` Reuben Hawkins [this message]
2015-01-07 21:46         ` [PATCH 3/3] configure.ac: check for HMAC_CTX_cleanup Eric Sunshine
2014-12-21 20:20 ` [PATCH 1/3] configure.ac: check tv_nsec field in struct stat Eric Sunshine
2014-12-21 21:47   ` Eric Sunshine
  -- strict thread matches above, loose matches on Subject: below --
2015-01-08 20:00 [PATCH 1/3] configure.ac: check 'tv_nsec' field in 'struct stat' Reuben Hawkins
2015-01-08 20:00 ` [PATCH 3/3] configure.ac: check for HMAC_CTX_cleanup Reuben Hawkins
2015-01-09  5:37   ` Eric Sunshine

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1420662236-27593-4-git-send-email-reubenhwk@gmail.com \
    --to=reubenhwk@gmail.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).