Merge branch 'phoenix' of https://github.com/InvictusInnovations/fc into phoenix

This commit is contained in:
vogel76 2013-12-18 15:36:45 +01:00
commit c019430fa7

View file

@ -116,7 +116,7 @@ uint32_t aes_decoder::decode( const char* ciphertxt, uint32_t plaintext_len, cha
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