From ecda75a273c653eeb42bd0449831a250433e05f0 Mon Sep 17 00:00:00 2001
From: manzerbredes <loic.guegan_secondary@yahoo.fr>
Date: Wed, 11 Mar 2015 17:11:48 +0400
Subject: [PATCH] Arrange code

---
 CryptClass/AESCrypt.cpp | 17 ++++-------------
 CryptClass/AESCrypt.hpp | 24 +++++++++++++++++++-----
 2 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/CryptClass/AESCrypt.cpp b/CryptClass/AESCrypt.cpp
index 0add260..5a1e3eb 100644
--- a/CryptClass/AESCrypt.cpp
+++ b/CryptClass/AESCrypt.cpp
@@ -26,7 +26,7 @@ AESCrypt::~AESCrypt(){
 
 
 
-//Encrypt string
+//Encrypt string with string key
 std::string AESCrypt::encrypt(std::string key, std::string data){
 
     //Generate SHA-256
@@ -36,14 +36,13 @@ std::string AESCrypt::encrypt(std::string key, std::string data){
     return encryptRoutine(data, digest, sizeof(digest));
 
 }
-//Encrypt string
+
+//Encrypt string with byte* key
 std::string AESCrypt::encrypt(byte* key, std::string data){
-
     return encryptRoutine(data, key, 32);
-
 }
 
-
+//The encryptRoutine
 std::string AESCrypt::encryptRoutine(std::string data, byte* digest, int size){
     //Contain data encrypted
     std::string cipher;
@@ -79,14 +78,6 @@ std::string AESCrypt::encryptRoutine(std::string data, byte* digest, int size){
 
 
 
-
-
-
-
-
-
-
-
 //Decrypt string
 std::string AESCrypt::decrypt(std::string key, std::string data){
 
diff --git a/CryptClass/AESCrypt.hpp b/CryptClass/AESCrypt.hpp
index 58642c1..5e16672 100644
--- a/CryptClass/AESCrypt.hpp
+++ b/CryptClass/AESCrypt.hpp
@@ -40,6 +40,21 @@ class AESCrypt : public AbstractSKA {
         ~AESCrypt();
 
 
+       /**
+        * @brief Run encryptRoutine.
+        *
+        * @param key : key used to encrypt data
+        * @param data : contain data to encrypt.
+        *
+        * @return string : correspond to crypted data
+        *
+        * Run encryptRoutine with byte* key or string key
+        *
+        */
+        std::string encrypt(std::string key, std::string data);
+        std::string encrypt(byte* key, std::string data);
+
+
        /**
         * @brief Encrypt data with AES algorithm.
         *
@@ -48,11 +63,13 @@ class AESCrypt : public AbstractSKA {
         *
         * @return string : correspond to crypted data
         *
-        * Encrypt data, and return them in a string.
+        * Encrypt data, and return them into a string.
         * Padding are blank space.
         *
         */
-        virtual std::string encrypt(std::string key, std::string data);
+        std::string encryptRoutine(std::string data, byte* digest, int size);
+
+
 
         /**
         * @brief Decrypt data from AES algorithm.
@@ -67,9 +84,6 @@ class AESCrypt : public AbstractSKA {
         */
         virtual std::string decrypt(std::string key, std::string data);
 
-        std::string encrypt(byte* key, std::string data);
-
-        std::string encryptRoutine(std::string data, byte* digest, int size);
 
 
     private: