diff options
| author | Brad King <brad.king@kitware.com> | 2018-09-26 13:50:43 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-09-26 13:50:43 (GMT) |
| commit | a9694d6538b5a975b08cea89bdd86ebce6166452 (patch) | |
| tree | b4766ad53d866a8767bcb1ae94ffb8f066326c18 /Utilities | |
| parent | 60e6e5db61d6f27814bb68dee1f497848e147ffb (diff) | |
| parent | e7e88e955bc773be792e645ee8558d78b4183a87 (diff) | |
| download | CMake-a9694d6538b5a975b08cea89bdd86ebce6166452.zip CMake-a9694d6538b5a975b08cea89bdd86ebce6166452.tar.gz CMake-a9694d6538b5a975b08cea89bdd86ebce6166452.tar.bz2 | |
Merge branch 'libarchive-libressl-2.7' into release-3.12
Merge-request: !2416
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 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) |