Peerplays_Blockchain/peerplays-fc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

updated ip serialization forwards

Browse source
This commit is contained in:
Daniel Larimer 2014-01-04 01:21:11 +00:00
parent c2de86ccd4
commit f618f3a10f
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/fc/io/raw_fwd.hpp
View file

@ -13,6 +13,7 @@ namespace fc {
class variant_object; class variant_object;
class path; class path;
template<typename IntType, typename EnumType> class enum_type; template<typename IntType, typename EnumType> class enum_type;
namespace ip { class endpoint; }
namespace ecc { class public_key; class private_key; } namespace ecc { class public_key; class private_key; }
namespace raw { namespace raw {
@ -32,6 +33,8 @@ namespace fc {
template<typename Stream> inline void pack( Stream& s, const path& v ); template<typename Stream> inline void pack( Stream& s, const path& v );
template<typename Stream> inline void unpack( Stream& s, path& v ); template<typename Stream> inline void unpack( Stream& s, path& v );
template<typename Stream> inline void pack( Stream& s, const ip::endpoint& v );
template<typename Stream> inline void unpack( Stream& s, ip::endpoint& v );
template<typename Stream, typename T> void unpack( Stream& s, fc::optional<T>& v ); template<typename Stream, typename T> void unpack( Stream& s, fc::optional<T>& v );

4
src/crypto/aes.cpp
View file

@ -6,6 +6,8 @@
#include <fc/io/fstream.hpp> #include <fc/io/fstream.hpp>
#include <fc/io/raw.hpp> #include <fc/io/raw.hpp>
#include <fc/log/logger.hpp>
namespace fc { namespace fc {
static int init = init_openssl(); 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", FC_THROW_EXCEPTION( exception, "error durring aes 256 cbc encryption update",
("s", ERR_error_string( ERR_get_error(), nullptr) ) ); ("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; return ciphertext_len;
} }
#if 0 #if 0