diff --git a/include/fc/io/raw_fwd.hpp b/include/fc/io/raw_fwd.hpp index 741fe13..b4f67ca 100644 --- a/include/fc/io/raw_fwd.hpp +++ b/include/fc/io/raw_fwd.hpp @@ -13,6 +13,7 @@ namespace fc { class variant_object; class path; template class enum_type; + namespace ip { class endpoint; } namespace ecc { class public_key; class private_key; } namespace raw { @@ -32,6 +33,8 @@ namespace fc { template inline void pack( Stream& s, const path& v ); template inline void unpack( Stream& s, path& v ); + template inline void pack( Stream& s, const ip::endpoint& v ); + template inline void unpack( Stream& s, ip::endpoint& v ); template void unpack( Stream& s, fc::optional& v ); diff --git a/src/crypto/aes.cpp b/src/crypto/aes.cpp index a27eb3e..7459c93 100644 --- a/src/crypto/aes.cpp +++ b/src/crypto/aes.cpp @@ -6,6 +6,8 @@ #include #include +#include + namespace fc { static int init = init_openssl(); @@ -53,7 +55,7 @@ uint32_t aes_encoder::encode( const char* plaintxt, uint32_t plaintext_len, char FC_THROW_EXCEPTION( exception, "error durring aes 256 cbc encryption update", ("s", ERR_error_string( ERR_get_error(), nullptr) ) ); } - FC_ASSERT( ciphertext_len == plaintext_len ); + FC_ASSERT( ciphertext_len == plaintext_len, "", ("ciphertext_len",ciphertext_len)("plaintext_len",plaintext_len) ); return ciphertext_len; } #if 0