diff --git a/.gitignore b/.gitignore
index c5941e1..96d95e3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,15 @@
+# project specific
bin/*
obj/*
-
!.empty
+*.o
+
+# intellij
+*.iml
+.idea/
+
+# cmake
+build/
+
+# visual code
+.vscode/
diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index e9ff9a0..0000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-aes
\ No newline at end of file
diff --git a/.idea/aes.iml b/.idea/aes.iml
deleted file mode 100644
index aa88931..0000000
--- a/.idea/aes.iml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
deleted file mode 100644
index 97626ba..0000000
--- a/.idea/encodings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index 3eb495b..0000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index 1de4e38..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 94a25f7..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
deleted file mode 100644
index 350e93e..0000000
--- a/.idea/workspace.xml
+++ /dev/null
@@ -1,296 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- true
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- C/C++
-
-
-
-
- Unused codeC/C++
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1453148077173
-
- 1453148077173
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.sonar/.sonar_lock b/.sonar/.sonar_lock
deleted file mode 100644
index e69de29..0000000
diff --git a/.sonar/report-task.txt b/.sonar/report-task.txt
deleted file mode 100644
index 14610a3..0000000
--- a/.sonar/report-task.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-projectKey=AES-lib
-serverUrl=http://localhost:9999
-dashboardUrl=http://localhost:9999/dashboard/index/AES-lib
-ceTaskId=AVl_T488HdLrEJ0l5eJp
-ceTaskUrl=http://localhost:9999/api/ce/task?id=AVl_T488HdLrEJ0l5eJp
diff --git a/CMakeLists.txt b/CMakeLists.txt
deleted file mode 100644
index 7232844..0000000
--- a/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-cmake_minimum_required(VERSION 3.3)
-project(aes)
-
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Wextra -ggdb -lcrypto")
-include_directories("/usr/include/openssl/")
-
-set(SOURCE_FILES aes.cpp)
-add_executable(crypto.ex ${SOURCE_FILES})
\ No newline at end of file
diff --git a/aes.hpp b/aes.hpp
index ab096cb..ffa117e 100644
--- a/aes.hpp
+++ b/aes.hpp
@@ -17,7 +17,7 @@
#include
#include
-#include "json/json.h"
+#include "lib/json/json.h"
#define FAILURE -1
#define SUCCESS 0
diff --git a/aes.cpp.modulaire b/aes.modulaire.cpp
similarity index 100%
rename from aes.cpp.modulaire
rename to aes.modulaire.cpp
diff --git a/crypt.hpp b/crypt.hpp
index b4aca98..e816f58 100644
--- a/crypt.hpp
+++ b/crypt.hpp
@@ -66,12 +66,11 @@ int crypt::aesEncrypt(const unsigned char *msg, size_t msgLen, unsigned char **e
return encMsgLen + blockLen;
}
-
crypt::~crypt() {
aes::clear_all();
EVP_CIPHER_CTX_cleanup(aesEncryptCtx);
- EVP_CIPHER_CTX_free(aesEncryptCtx);
- //free(aesEncryptCtx);
+ EVP_CIPHER_CTX_free(aesEncryptCtx);
+ //free(aesEncryptCtx);
}
#endif
diff --git a/jsoncpp.o b/jsoncpp.o
deleted file mode 100644
index 44cf9c2..0000000
Binary files a/jsoncpp.o and /dev/null differ
diff --git a/json/json-forwards.h b/lib/json/json-forwards.h
similarity index 100%
rename from json/json-forwards.h
rename to lib/json/json-forwards.h
diff --git a/json/json.h b/lib/json/json.h
similarity index 100%
rename from json/json.h
rename to lib/json/json.h
diff --git a/jsoncpp.cpp b/lib/jsoncpp.cpp
similarity index 100%
rename from jsoncpp.cpp
rename to lib/jsoncpp.cpp
diff --git a/sonar-project.properties b/sonar-project.properties
deleted file mode 100644
index a9024c6..0000000
--- a/sonar-project.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-# must be unique in a given SonarQube instance
-sonar.projectKey=AES-lib
-
-# this is the name and version displayed in the SonarQube UI. Was mandatory prior to SonarQube 6.1.
-sonar.projectName=AES-lib
-sonar.projectVersion=1.0
-
-sonar.sources=./
-sonar.language=c++