1 files changed, 44 insertions, 24 deletions

diff --git a/IOFileClass/FileManIOFile.cpp b/IOFileClass/FileManIOFile.cpp
index bee2ebe..ea49201 100644
--- a/IOFileClass/FileManIOFile.cpp
+++ b/IOFileClass/FileManIOFile.cpp
@@ -10,36 +10,38 @@
 
 
 #include "FileManIOFile.hpp"
-#include <iomanip> // This might be necessary
 
+//Constructor with filename
 FileManIOFile::FileManIOFile(std::string filename){
     this->filename=filename;
     this->readable=false;
     this->data="";
     this->key;
 }
+
+//Destructor
 FileManIOFile::~FileManIOFile(){
 }
 
 
-bool FileManIOFile::isReadable(){
-    return this->readable;
-}
-
 
+//Read the filename with a key
 void FileManIOFile::read(std::string key){
 
-    AESCrypt aes;
-    HASHCrypt hash;
-
+    //create file object
     std::ifstream file;
+
+    //Clear data
     this->data.clear();
 
+    //Open file
     file.open (this->filename, std::ios::in | std::ios::binary);
 
+    //Get MD5 of decrypted data
     byte fileMD5[16];
     file.read((char*) fileMD5, sizeof(fileMD5));
 
+    //Read all data
     char car;
     file.read(&car, sizeof(car));
 
@@ -49,20 +51,25 @@ void FileManIOFile::read(std::string key){
 
     }
 
-    this->data=aes.decrypt(key, this->data);
+    //Decrypt data
+    this->data=this->aes.decrypt(key, this->data);
 
+    //Get current MD5 of decrypted data
     byte currentMD5[16];
-    hash.getMD5_128(this->data, currentMD5, sizeof(currentMD5));
+    this->hash.getMD5_128(this->data, currentMD5, sizeof(currentMD5));
 
-    if(hash.compareDigest(fileMD5, currentMD5, sizeof(currentMD5))){
+    //Compare the 2 MD5 to find if file is fully decrypted
+    if(this->hash.compareDigest(fileMD5, currentMD5, sizeof(currentMD5))){
+        //Set readable
         this->readable=true;
-        hash.getSHA_256(key, this->key, 32);
+        //Save the key
+        this->hash.getSHA_256(key, this->key, 32);
     }
     else{
         this->readable=false;
     }
 
-
+    //Close file
     file.close();
 
 
@@ -70,58 +77,71 @@ void FileManIOFile::read(std::string key){
 
 
 
-
+//Write file with key
 void FileManIOFile::write(std::string key,std::string data){
 
-    AESCrypt aes;
     std::string dataEncrypted;
 
-    dataEncrypted=aes.encrypt(key, data);
+    dataEncrypted=this->aes.encrypt(key, data);
 
     this->writeRoutine(data, dataEncrypted);
 
 
 }
 
+//Write file without key
 void FileManIOFile::write(std::string data){
     if(not(this->readable)){
         std::cout << "Can't write data without key (read it before) !" << std::endl;
         std::exit(EXIT_FAILURE);
     }
-    AESCrypt aes;
+
     std::string dataEncrypted;
 
-    dataEncrypted=aes.encrypt(this->key, data);
+    dataEncrypted=this->aes.encrypt(this->key, data);
     this->writeRoutine(data, dataEncrypted);
 
 
 }
 
 
+
+//Get readable attribute
+bool FileManIOFile::isReadable(){
+    return this->readable;
+}
+
+
+
+//Write file
 void FileManIOFile::writeRoutine(std::string data, std::string dataEncrypted){
-    HASHCrypt hash;
 
+    //Save MD5 of decrypted data
     byte digest[16];
-    hash.getMD5_128(data, digest, sizeof(digest));
-
+    this->hash.getMD5_128(data, digest, sizeof(digest));
 
+    //Create file instance
     std::ofstream file;
+
+    //Open it
     file.open(this->filename, std::ios::out | std::ios::binary);
 
+    //Write MD5 on 16 first bytes
     file.write((char *) digest,sizeof(digest));
 
-
+    //Write data
     file.write(dataEncrypted.c_str(), dataEncrypted.size());
 
-
-
+    //Close file
     file.close();
 
+    //Save data to attribute
     this->data=data;
 }
 
 
 
+//Get data
 std::string FileManIOFile::getData(){
     return this->data;
 }