Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/bsd/libarchive/dist/libarchive Adapt the version ha...
details: https://anonhg.NetBSD.org/src/rev/af0a51abbc21
branches: trunk
changeset: 359232:af0a51abbc21
user: martin <martin%NetBSD.org@localhost>
date: Mon Feb 05 10:46:19 2018 +0000
description:
Adapt the version hack for openssl provided inline functions: openssl 1.0.2k
already provides the colliding definitions.
diffstat:
external/bsd/libarchive/dist/libarchive/archive_openssl_hmac_private.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diffs (12 lines):
diff -r 1848d1e967dd -r af0a51abbc21 external/bsd/libarchive/dist/libarchive/archive_openssl_hmac_private.h
--- a/external/bsd/libarchive/dist/libarchive/archive_openssl_hmac_private.h Mon Feb 05 10:41:12 2018 +0000
+++ b/external/bsd/libarchive/dist/libarchive/archive_openssl_hmac_private.h Mon Feb 05 10:46:19 2018 +0000
@@ -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)
Home |
Main Index |
Thread Index |
Old Index