[Forensics-changes] [yara] 138/192: libyara.c: Fix openssl #include (#637)

Hilko Bengen bengen at moszumanska.debian.org
Sat Jul 1 10:31:57 UTC 2017


This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to annotated tag v3.6.0
in repository yara.

commit a2dc7ebe4fcdc860313854efb016aeb1427de7d3
Author: Hilko Bengen <hillu at users.noreply.github.com>
Date:   Tue Apr 18 21:46:31 2017 +0200

    libyara.c: Fix openssl #include (#637)
    
    openssl/crypto.h is only used for locking which is not needed after OpenSSL 1.1
---
 libyara/libyara.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libyara/libyara.c b/libyara/libyara.c
index a5deb85..16b248a 100644
--- a/libyara/libyara.c
+++ b/libyara/libyara.c
@@ -37,7 +37,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <yara/mem.h>
 #include <yara/threading.h>
 
-#ifdef HAVE_LIBCRYPTO
+#ifdef HAVE_LIBCRYPTO && OPENSSL_VERSION_NUMBER < 0x10100000L
 #include <openssl/crypto.h>
 #endif
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/forensics/yara.git



More information about the forensics-changes mailing list