diff options
| author | Brad King <brad.king@kitware.com> | 2018-09-26 13:46:27 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-09-26 13:47:53 (GMT) |
| commit | e7e88e955bc773be792e645ee8558d78b4183a87 (patch) | |
| tree | ade0030215397f56b6d3844bb30f0770279f87d3 | |
| parent | f478fa633daeb1432805821adddc40730ffd283d (diff) | |
| download | CMake-e7e88e955bc773be792e645ee8558d78b4183a87.zip CMake-e7e88e955bc773be792e645ee8558d78b4183a87.tar.gz CMake-e7e88e955bc773be792e645ee8558d78b4183a87.tar.bz2 | |
libarchive: Backport fix for build with LibreSSL 2.7
Backport libarchive commit v3.3.3~16^2 (fix build with LibreSSL 2.7,
2018-04-01). LibreSSL 2.7 adds OpenSSL 1.1 API leading to conflicts on
method names.
Fixes: #18404
| -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) |