Browse Source

correction des malloc des AES_EVP_CONTEXT utilisation des fonctions proposé par openSSL

master
parent
commit
34e67caa15
5 changed files with 14 additions and 7 deletions
  1. +4
    -0
      .gitignore
  2. +2
    -2
      Makefile
  3. +0
    -0
      bin/.empty
  4. +8
    -5
      decrypt.hpp
  5. +0
    -0
      obj/.empty

+ 4
- 0
.gitignore View File

@@ -0,0 +1,4 @@
bin/*
obj/*

!.empty

+ 2
- 2
Makefile View File

@@ -5,7 +5,7 @@ main: main.cpp jsoncpp.o
@echo "compilation de aes"
@g++ -Wall -Wextra -ggdb -o $(EXEC) $(SRC) obj/jsoncpp.o -lcrypto --std=c++14

jsoncpp.o: jsoncpp.cpp json/json.h json/json-forwards.h
obj/jsoncpp.o: jsoncpp.cpp json/json.h json/json-forwards.h
@echo "compilation de jsoncpp"
@g++ -I ../lib/jsoncpp-master/include/ -Wall -Wextra -std=c++11 -c -ggdb jsoncpp.cpp -o obj/jsoncpp.o

@@ -15,7 +15,7 @@ run2:
run:
@./$(EXEC) file

decrypt.ex: mainDecrypt.cpp jsoncpp.o aes.hpp
decrypt.ex: mainDecrypt.cpp obj/jsoncpp.o aes.hpp
@echo "compilation de decrypt.ex"
@g++ -Wall -Wextra -ggdb -o bin/decrypt.ex mainDecrypt.cpp obj/jsoncpp.o -lcrypto --std=c++14



+ 0
- 0
bin/.empty View File


+ 8
- 5
decrypt.hpp View File

@@ -5,7 +5,7 @@

class decrypt : public aes {
private:
EVP_CIPHER_CTX* aesDecryptCtx;
EVP_CIPHER_CTX* aesDecryptCtx;
public:
decrypt(std::string filename, unsigned char* aesKey=0, unsigned char* aesIV=0);
decrypt(const decrypt& a);
@@ -16,7 +16,8 @@ public:
};

decrypt::decrypt(std::string filename, unsigned char* aesKey, unsigned char* aesIV) : aes(filename) {
aesDecryptCtx = (EVP_CIPHER_CTX*)malloc(sizeof(EVP_CIPHER_CTX));
aesDecryptCtx = EVP_CIPHER_CTX_new();
//aesDecryptCtx = (EVP_CIPHER_CTX*)malloc(sizeof(EVP_CIPHER_CTX));
if(aesDecryptCtx == NULL) {
exit(FAILURE);
}
@@ -31,7 +32,8 @@ decrypt::decrypt(std::string filename, unsigned char* aesKey, unsigned char* aes

decrypt::decrypt(const decrypt& _a) : aes::aes() {
this->clone(_a);
aesDecryptCtx = (EVP_CIPHER_CTX*)malloc(sizeof(EVP_CIPHER_CTX));
aesDecryptCtx = EVP_CIPHER_CTX_new();
//aesDecryptCtx = (EVP_CIPHER_CTX*)malloc(sizeof(EVP_CIPHER_CTX));
if(aesDecryptCtx == NULL) {
exit(FAILURE);
}
@@ -77,7 +79,8 @@ int decrypt::aesDecrypt(unsigned char *encMsg, size_t encMsgLen, unsigned char *
decrypt::~decrypt() {
aes::clear_all();
EVP_CIPHER_CTX_cleanup(aesDecryptCtx);
free(aesDecryptCtx);
EVP_CIPHER_CTX_free(aesDecryptCtx);
//free(aesDecryptCtx);
}

#endif
#endif

+ 0
- 0
obj/.empty View File


Loading…
Cancel
Save