Module Name: src Committed By: christos Date: Mon Feb 5 12:13:54 UTC 2018
Modified Files: src/external/bsd/libarchive/dist/libarchive: archive_openssl_evp_private.h archive_openssl_hmac_private.h Log Message: undo previous. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/external/bsd/libarchive/dist/libarchive/archive_openssl_evp_private.h \ 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_evp_private.h diff -u src/external/bsd/libarchive/dist/libarchive/archive_openssl_evp_private.h:1.2 src/external/bsd/libarchive/dist/libarchive/archive_openssl_evp_private.h:1.3 --- src/external/bsd/libarchive/dist/libarchive/archive_openssl_evp_private.h:1.2 Mon Feb 5 05:26:06 2018 +++ src/external/bsd/libarchive/dist/libarchive/archive_openssl_evp_private.h Mon Feb 5 07:13:54 2018 @@ -28,7 +28,7 @@ #include <openssl/evp.h> #include <openssl/opensslv.h> -#if OPENSSL_VERSION_NUMBER < 0x100020bfL +#if OPENSSL_VERSION_NUMBER < 0x10100000L #include <stdlib.h> /* malloc, free */ #include <string.h> /* memset */ static inline EVP_MD_CTX *EVP_MD_CTX_new(void) 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.2 src/external/bsd/libarchive/dist/libarchive/archive_openssl_hmac_private.h:1.3 --- src/external/bsd/libarchive/dist/libarchive/archive_openssl_hmac_private.h:1.2 Mon Feb 5 05:46:19 2018 +++ src/external/bsd/libarchive/dist/libarchive/archive_openssl_hmac_private.h Mon Feb 5 07:13:54 2018 @@ -28,7 +28,7 @@ #include <openssl/hmac.h> #include <openssl/opensslv.h> -#if OPENSSL_VERSION_NUMBER < 0x100020bfL || defined(LIBRESSL_VERSION_NUMBER) +#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) #include <stdlib.h> /* malloc, free */ #include <string.h> /* memset */ static inline HMAC_CTX *HMAC_CTX_new(void)