loic/forgetIt
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change AESCrypt to support mutiple key type (string and byte)

Browse source
This commit is contained in:
manzerbredes 2015-03-11 16:47:05 +04:00
parent 0b16b8eb9a
commit e261782473
4 changed files with 40 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
IOFileClass/FileManIOFile.cpp
View file

@ -16,6 +16,7 @@ FileManIOFile::FileManIOFile(std::string filename){
this->filename=filename;
this->readable=false;
this->data="";
this->key[0]=NULL;
}
FileManIOFile::~FileManIOFile(){
}
@ -55,6 +56,7 @@ void FileManIOFile::read(std::string key){
if(hash.compareDigest(fileMD5, currentMD5, sizeof(currentMD5))){
this->readable=true;
hash.getSHA_256(key, this->key, 32);
}
else{
this->readable=false;
@ -70,8 +72,14 @@ void FileManIOFile::write(std::string key, std::string data){
AESCrypt aes;
HASHCrypt hash;
std::string dataEncrypted;
std::string dataEncrypted=aes.encrypt(key, data);
if(this->key!=NULL){
dataEncrypted=aes.encrypt(key, data);
}
else{
dataEncrypted=aes.encrypt(this->key, data);
}
byte digest[16];
hash.getMD5_128(data, digest, sizeof(digest));

4
IOFileClass/FileManIOFile.hpp
View file

@ -58,7 +58,7 @@ class FileManIOFile {
* Save data to "filename" attribute.
*
*/
void write(std::string key, std::string data);
void write(std::string data,std::string key=NULL);
/**
* @brief True if file fully decrypted.
@ -87,6 +87,8 @@ class FileManIOFile {
bool readable; ///< Readable attribute
byte key[32]; ///< Key in SHA-256