Skip to content

Commit

Permalink
Fixing compilation errors on Linux.
Browse files Browse the repository at this point in the history
Signed-off-by: Ivan Kwiatkowski <justicerage@manalyzer.org>
  • Loading branch information
JusticeRage committed May 31, 2017
1 parent 14f1bc5 commit a1e019e
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
7 changes: 6 additions & 1 deletion plugins/plugin_virustotal/plugin_virustotal.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -271,8 +271,13 @@ bool vt_api_interact(const std::string& hash,
ss << &response;
}

#if defined WITH_OPENSSL
// This #define mess is necessary because OpenSSL 1.1 does no longer define SSL_SHORT_READ,
// but earlier Boost version (such as 1.55.0) do not define ssl::error::stream_truncated yet.

#if defined WITH_OPENSSL && defined SSL_R_SHORT_READ
// SSL connexions may be terminated by a short read error.
if (error != boost::asio::error::eof && error.value() != ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SHORT_READ)) {
#elif defined WITH_OPENSSL
if (error != boost::asio::error::eof && error != ssl::error::stream_truncated) {
#else
if (error != boost::asio::error::eof) {
Expand Down
3 changes: 3 additions & 0 deletions plugins/plugins_yara.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@
// The structure used to communicate with the yara ManaPE module.
#include "yara/modules/manape_data.h"

// TODO: Remove when Yara doesn't mask get_object anymore
#undef get_object

// Used to validate bitcoin addresses.
#include "hash-library/bitcoin.h"

Expand Down

0 comments on commit a1e019e

Please sign in to comment.