From 3528afe987bda19a59652e7183c400c33d3e139e Mon Sep 17 00:00:00 2001 From: antoine Date: Fri, 20 May 2016 21:05:23 +0200 Subject: [PATCH] call aesEncrypt --- .idea/aes.iml | 1 - .idea/workspace.xml | 98 +++++++++++++++----------------------------- aes.hpp | 2 +- bin/crypt.ex | Bin 2697360 -> 2697360 bytes mainCrypt.cpp | 4 ++ 5 files changed, 37 insertions(+), 68 deletions(-) diff --git a/.idea/aes.iml b/.idea/aes.iml index 921849b..aa88931 100644 --- a/.idea/aes.iml +++ b/.idea/aes.iml @@ -4,7 +4,6 @@ - diff --git a/.idea/workspace.xml b/.idea/workspace.xml index affbea9..350e93e 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,14 +2,14 @@ + - + - - + @@ -19,8 +19,9 @@ - - + + + @@ -40,45 +41,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - @@ -224,12 +190,12 @@ - + - + - + @@ -271,7 +237,7 @@ - + @@ -279,6 +245,14 @@ + + + + + + + + @@ -302,26 +276,18 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + diff --git a/aes.hpp b/aes.hpp index 5e8c1d8..ab096cb 100644 --- a/aes.hpp +++ b/aes.hpp @@ -130,7 +130,7 @@ int aes::readFile(unsigned char** file, const char* filename) { fseek(fd, 0, SEEK_SET); // Allocate space for the file - *file = (unsigned char*)malloc(fileLength); + *file = (unsigned char*)malloc(fileLength); // @FIXME : failed for bigest file // maybe with new if(*file == NULL) { fprintf(stderr, "Failed to allocate memory\n"); exit(1); diff --git a/bin/crypt.ex b/bin/crypt.ex index 4fc9647dd33983bba56ce13486a7616ea1df02ee..0b040fd64cd16f4debde505f557edd094470e8de 100755 GIT binary patch delta 787 zcmXxgT}TvB6ae6RW~OcQW^UK9b^UF3)uLU+Ffdp%D2d3R$XKJ76#Bt_$bN)0Q^bdT zDcY6buC=QR8f=8R5;9`6^dJ!=lD?#1!#=1LgpAUU6;x*&8~8Y!d(ORc&kaluKmf&$ z2};FU;7eIksQ%Q{)ZDk~%Uw%**IqoY7ba_krj@QzpTE=xNI)Wz&?aO-n~{uCP^wz$ zqh*KTFFzZmb{OX^VVVzpJQSw6(8EW=v<_lCEka$;&-X-VBdqer5$c3xo`}#qSm5&! z-0+_NHnItB@5L;^_Zi_Wuj|FdX|=hRwx+{?Mc5%tvro)AEggs4u7l;r%twGU@ zMA$Gd9Hx~xRl_jdkJsumvI#zKgh_6XW0>JS48^lc2iMPO)8WSXn}p4M$RR`uhT1GE zK=9L{k+69_7N=E?1@oWpS~YM;GGU9Ism3UJy9RSzc&CrtHi8qbnr*W!8*N`V+V1Lb zt@##VKh-BAG+XRQdG>kz&N>_?O6rtX!~srd;CfAnl4g$o36C~jNl7=x7lKDL81rB` z!z?GU421$wluCRJAy}=!@@_ z8ci#&wYtqCt|Z}5jZ74`zf<0d(vcNyQ#)nmb;23-G-$!HBq(<*#) z%RX4*C&JVTk9b>{7C@AT!ZZ&;d@M{GAkNbxv;<;&YlJpKirGRhm`(61GrZspQCytXTB5Yw4n5o$qSesHy~Ff^J2qq!iKq^CB_SsWgvBO5 z3z!dd=@97?3A@7|57W&%<5pYZe_PyYGq;7V*$9iDU9h$paHff{!Q?N22_Q{`Sj$(A`@V*=Gw7|1Ral(|^>+H#T)R;8OV+tXr1PlS#>cS*CsZxHUO1x_p$-F&1b#rrlTMzDdH*l zdCdWt07y1|DLZq0ptqc%Or)SJWUghS9OOhUl#B9EJ}N+ks0g`HF)BeGREo;b2CcVz HreadFile(&file); + O->aesEncrypt(); + printf("%d bytes to be encrypted\n", (int)fileLength); // Encrypt the file @@ -38,6 +41,7 @@ int main(int argc, char* argv[]) { free(encryptedFile); free(file); +//****************************************************************** delete O; return 0;