Re: [PATCH v6 2/2] imap-send: eliminate HMAC deprecation warnings on Mac OS X

From: Junio C Hamano <gitster@pobox.com>
Date: May 16, 2013, 00:39 UTC
Message-ID: <7v7gizahcn.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1368663120-47102-2-git-send-email-davvid@gmail.com>

David Aguilar <davvid@gmail.com> writes:

> Mac OS X 10.8 Mountain Lion warns that HMAC_Init() and friends
> are deprecated.  Detect the COMMON_CRYPTO_FOR_OPENSSL definition

Ahh, I think you meant to use that name but forgot to adjust the symbol you use in the patch ;-)

I'll queue with s/COMMON_DIGEST_FOR_OPENSSL/COMMON_CRYPTO_FOR_OPENSSL/;

Show 31 quoted lines

> and use CommonCrypto's HMAC functions to eliminate the warnings.
>
> Signed-off-by: David Aguilar <davvid@gmail.com>
> ---
> Changes since last time: None.
>
>  imap-send.c | 10 ++++++++++
>  1 file changed, 10 insertions(+)
>
> diff --git a/imap-send.c b/imap-send.c
> index d9bcfb4..96012b1 100644
> --- a/imap-send.c
> +++ b/imap-send.c
> @@ -29,8 +29,18 @@
>  #ifdef NO_OPENSSL
>  typedef void *SSL;
>  #else
> +#ifdef COMMON_DIGEST_FOR_OPENSSL
> +#include <CommonCrypto/CommonHMAC.h>
> +#define HMAC_CTX CCHmacContext
> +#define HMAC_Init(hmac, key, len, algo) CCHmacInit(hmac, algo, key, len)
> +#define HMAC_Update CCHmacUpdate
> +#define HMAC_Final(hmac, hash, ptr) CCHmacFinal(hmac, hash)
> +#define HMAC_CTX_cleanup
> +#define EVP_md5() kCCHmacAlgMD5
> +#else
>  #include <openssl/evp.h>
>  #include <openssl/hmac.h>
> +#endif
>  #include <openssl/x509v3.h>
>  #endif