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

Fix signed/unsigned warnings

Browse source
This commit is contained in:
Eric Frias 2014-06-26 15:51:01 -04:00
parent 862e7bb5d3
commit 560b107e58
2 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
include/fc/crypto/aes.hpp
View file

@ -37,12 +37,12 @@ namespace fc {
fc::fwd<impl,96> my; fc::fwd<impl,96> my;
}; };
int aes_encrypt(unsigned char *plaintext, int plaintext_len, unsigned char *key, unsigned aes_encrypt(unsigned char *plaintext, int plaintext_len, unsigned char *key,
unsigned char *iv, unsigned char *ciphertext); unsigned char *iv, unsigned char *ciphertext);
int aes_decrypt(unsigned char *ciphertext, int ciphertext_len, unsigned char *key, unsigned aes_decrypt(unsigned char *ciphertext, int ciphertext_len, unsigned char *key,
unsigned char *iv, unsigned char *plaintext); unsigned char *iv, unsigned char *plaintext);
int aes_cfb_decrypt(unsigned char *ciphertext, int ciphertext_len, unsigned char *key, unsigned aes_cfb_decrypt(unsigned char *ciphertext, int ciphertext_len, unsigned char *key,
unsigned char *iv, unsigned char *plaintext); unsigned char *iv, unsigned char *plaintext);
std::vector<char> aes_encrypt( const fc::sha512& key, const std::vector<char>& plain_text ); std::vector<char> aes_encrypt( const fc::sha512& key, const std::vector<char>& plain_text );
std::vector<char> aes_decrypt( const fc::sha512& key, const std::vector<char>& cipher_text ); std::vector<char> aes_decrypt( const fc::sha512& key, const std::vector<char>& cipher_text );

22
src/crypto/aes.cpp
View file

@ -157,13 +157,13 @@ uint32_t aes_decoder::final_decode( char* plaintext )
/** example method from wiki.opensslfoundation.com */ /** example method from wiki.opensslfoundation.com */
int aes_encrypt(unsigned char *plaintext, int plaintext_len, unsigned char *key, unsigned aes_encrypt(unsigned char *plaintext, int plaintext_len, unsigned char *key,
unsigned char *iv, unsigned char *ciphertext) unsigned char *iv, unsigned char *ciphertext)
{ {
evp_cipher_ctx ctx( EVP_CIPHER_CTX_new() ); evp_cipher_ctx ctx( EVP_CIPHER_CTX_new() );
int len = 0; int len = 0;
int ciphertext_len = 0; unsigned ciphertext_len = 0;
/* Create and initialise the context */ /* Create and initialise the context */
if(!ctx) if(!ctx)
@ -206,12 +206,12 @@ int aes_encrypt(unsigned char *plaintext, int plaintext_len, unsigned char *key,
return ciphertext_len; return ciphertext_len;
} }
int aes_decrypt(unsigned char *ciphertext, int ciphertext_len, unsigned char *key, unsigned aes_decrypt(unsigned char *ciphertext, int ciphertext_len, unsigned char *key,
unsigned char *iv, unsigned char *plaintext) unsigned char *iv, unsigned char *plaintext)
{ {
evp_cipher_ctx ctx( EVP_CIPHER_CTX_new() ); evp_cipher_ctx ctx( EVP_CIPHER_CTX_new() );
int len = 0; int len = 0;
int plaintext_len = 0; unsigned plaintext_len = 0;
/* Create and initialise the context */ /* Create and initialise the context */
if(!ctx) if(!ctx)
@ -255,12 +255,12 @@ int aes_decrypt(unsigned char *ciphertext, int ciphertext_len, unsigned char *ke
return plaintext_len; return plaintext_len;
} }
int aes_cfb_decrypt(unsigned char *ciphertext, int ciphertext_len, unsigned char *key, unsigned aes_cfb_decrypt(unsigned char *ciphertext, int ciphertext_len, unsigned char *key,
unsigned char *iv, unsigned char *plaintext) unsigned char *iv, unsigned char *plaintext)
{ {
evp_cipher_ctx ctx( EVP_CIPHER_CTX_new() ); evp_cipher_ctx ctx( EVP_CIPHER_CTX_new() );
int len = 0; int len = 0;
int plaintext_len = 0; unsigned plaintext_len = 0;
/* Create and initialise the context */ /* Create and initialise the context */
if(!ctx) if(!ctx)
@ -308,8 +308,8 @@ std::vector<char> aes_encrypt( const fc::sha512& key, const std::vector<char>& p
{ {
std::vector<char> cipher_text(plain_text.size()+16); std::vector<char> cipher_text(plain_text.size()+16);
auto cipher_len = aes_encrypt( (unsigned char*)plain_text.data(), plain_text.size(), auto cipher_len = aes_encrypt( (unsigned char*)plain_text.data(), plain_text.size(),
(unsigned char*)&key, ((unsigned char*)&key)+32, (unsigned char*)&key, ((unsigned char*)&key)+32,
(unsigned char*)cipher_text.data() ); (unsigned char*)cipher_text.data() );
FC_ASSERT( cipher_len <= cipher_text.size() ); FC_ASSERT( cipher_len <= cipher_text.size() );
cipher_text.resize(cipher_len); cipher_text.resize(cipher_len);
return cipher_text; return cipher_text;