diff options
| author | Brad King <brad.king@kitware.com> | 2018-09-27 18:48:44 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-09-27 18:48:50 (GMT) |
| commit | e9f656da8222e23785a0a7912cb59f195eeb2e0b (patch) | |
| tree | 2dd45c29dd3b06610b5a81dfcd7fa4486caa241f | |
| parent | acf0627470df1d9ed533eaa437d8ee6ac2717e84 (diff) | |
| parent | e7e88e955bc773be792e645ee8558d78b4183a87 (diff) | |
| download | CMake-e9f656da8222e23785a0a7912cb59f195eeb2e0b.zip CMake-e9f656da8222e23785a0a7912cb59f195eeb2e0b.tar.gz CMake-e9f656da8222e23785a0a7912cb59f195eeb2e0b.tar.bz2 | |
Merge topic 'libarchive-libressl-2.7'
e7e88e955b libarchive: Backport fix for build with LibreSSL 2.7
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2416
| -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 59f95b8..921249b 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) |