diff options
| author | Brad King <brad.king@kitware.com> | 2018-09-26 09:51:12 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-09-26 09:51:12 -0400 |
| commit | 97e1213a88437835256aba8e9628a5375265978f (patch) | |
| tree | 7e6986f197cfe79978d20fde229c7b160d340e7f /Utilities | |
| parent | 3181f8405bc949affb8ea321ec7746b44717fd99 (diff) | |
| parent | e7e88e955bc773be792e645ee8558d78b4183a87 (diff) | |
| download | cmake-97e1213a88437835256aba8e9628a5375265978f.tar.gz | |
Merge branch 'libarchive-libressl-2.7' into update-libarchive
Diffstat (limited to 'Utilities')
| -rw-r--r-- | Utilities/cmlibarchive/libarchive/archive_openssl_hmac_private.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Utilities/cmlibarchive/libarchive/archive_openssl_hmac_private.h b/Utilities/cmlibarchive/libarchive/archive_openssl_hmac_private.h index 59f95b80af..921249bb94 100644 --- a/Utilities/cmlibarchive/libarchive/archive_openssl_hmac_private.h +++ b/Utilities/cmlibarchive/libarchive/archive_openssl_hmac_private.h @@ -28,7 +28,8 @@ #include <openssl/hmac.h> #include <openssl/opensslv.h> -#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) +#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ + (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) #include <stdlib.h> /* malloc, free */ #include <string.h> /* memset */ static inline HMAC_CTX *HMAC_CTX_new(void) |