Module Name: src
Committed By: martin
Date: Mon Feb 5 10:46:19 UTC 2018
Modified Files:
src/external/bsd/libarchive/dist/libarchive:
archive_openssl_hmac_private.h
Log Message:
Adapt the version hack for openssl provided inline functions: openssl 1.0.2k
already provides the colliding definitions.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/bsd/libarchive/dist/libarchive/archive_openssl_hmac_private.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/libarchive/dist/libarchive/archive_openssl_hmac_private.h
diff -u src/external/bsd/libarchive/dist/libarchive/archive_openssl_hmac_private.h:1.1.1.1 src/external/bsd/libarchive/dist/libarchive/archive_openssl_hmac_private.h:1.2
--- src/external/bsd/libarchive/dist/libarchive/archive_openssl_hmac_private.h:1.1.1.1 Thu Apr 20 12:55:32 2017
+++ src/external/bsd/libarchive/dist/libarchive/archive_openssl_hmac_private.h Mon Feb 5 10:46:19 2018
@@ -28,7 +28,7 @@
#include <openssl/hmac.h>
#include <openssl/opensslv.h>
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER < 0x100020bfL || defined(LIBRESSL_VERSION_NUMBER)
#include <stdlib.h> /* malloc, free */
#include <string.h> /* memset */
static inline HMAC_CTX *HMAC_CTX_new(void)
