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

FC Updates from BitShares and myself #21

Closed
nathanielhourt wants to merge 687 commits from dapp-support into latest-fc
pull from: dapp-support
merge into: Peerplays_Blockchain:latest-fc
Conversation 4 Commits 687 Files changed 314 +9 -2
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 5a9cf32696 - Show all commits

11
src/crypto/aes.cpp
View file

@ -9,6 +9,7 @@
#include <fc/log/logger.hpp> #include <fc/log/logger.hpp>
#include <fc/thread/thread.hpp> #include <fc/thread/thread.hpp>
#include <boost/endian/buffers.hpp>
#include <boost/thread/mutex.hpp> #include <boost/thread/mutex.hpp>
#include <openssl/opensslconf.h> #include <openssl/opensslconf.h>
#ifndef OPENSSL_THREADS #ifndef OPENSSL_THREADS
@ -52,7 +53,10 @@ void aes_encoder::init( const fc::sha256& key, const fc::uint128& init_value )
* In this example we are using 256 bit AES (i.e. a 256 bit key). The * In this example we are using 256 bit AES (i.e. a 256 bit key). The
* IV size for *most* modes is the same as the block size. For AES this * IV size for *most* modes is the same as the block size. For AES this
* is 128 bits */ * is 128 bits */
if(1 != EVP_EncryptInit_ex(my->ctx, EVP_aes_256_cbc(), NULL, (unsigned char*)&key, (unsigned char*)&init_value)) boost::endian::little_uint64_buf_t iv[2];
iv[0] = init_value.hi;
iv[1] = init_value.lo;
if(1 != EVP_EncryptInit_ex(my->ctx, EVP_aes_256_cbc(), NULL, (unsigned char*)&key, (const unsigned char*)iv[0].data()))
{ {
FC_THROW_EXCEPTION( aes_exception, "error during aes 256 cbc encryption init", FC_THROW_EXCEPTION( aes_exception, "error during aes 256 cbc encryption init",
("s", ERR_error_string( ERR_get_error(), nullptr) ) ); ("s", ERR_error_string( ERR_get_error(), nullptr) ) );
@ -117,7 +121,10 @@ void aes_decoder::init( const fc::sha256& key, const fc::uint128& init_value )
* In this example we are using 256 bit AES (i.e. a 256 bit key). The * In this example we are using 256 bit AES (i.e. a 256 bit key). The
* IV size for *most* modes is the same as the block size. For AES this * IV size for *most* modes is the same as the block size. For AES this
* is 128 bits */ * is 128 bits */
if(1 != EVP_DecryptInit_ex(my->ctx, EVP_aes_256_cbc(), NULL, (unsigned char*)&key, (unsigned char*)&init_value)) boost::endian::little_uint64_buf_t iv[2];
iv[0] = init_value.hi;
iv[1] = init_value.lo;
if(1 != EVP_DecryptInit_ex(my->ctx, EVP_aes_256_cbc(), NULL, (unsigned char*)&key, (const unsigned char*)iv[0].data()))
{ {
FC_THROW_EXCEPTION( aes_exception, "error during aes 256 cbc encryption init", FC_THROW_EXCEPTION( aes_exception, "error during aes 256 cbc encryption init",
("s", ERR_error_string( ERR_get_error(), nullptr) ) ); ("s", ERR_error_string( ERR_get_error(), nullptr) ) );