new

[Cipher_code.git] / OneRoundIoT / OneRound / one_round_new.cpp

diff --git a/OneRoundIoT/OneRound/one_round_new.cpp b/OneRoundIoT/OneRound/one_round_new.cpp
index 1fe114c12aad36c0d4afc85a0d66a885ab31dd93..fd1ff8a4b36eb1466e7749f84a78e2ff67dc7570 100644 (file)
--- a/OneRoundIoT/OneRound/one_round_new.cpp
+++ b/OneRoundIoT/OneRound/one_round_new.cpp
@@ -139,8 +139,11 @@ template<int h2>
 void encrypt_ctr(uchar* seq_in, uchar *seq_out, int len,uchar* RM1,int *Pbox, int *PboxRM, uchar *Sbox1, uchar *Sbox2, int enc) {
 
 
-  uchar *X=new uchar[h2];
-  uchar *fX=new uchar[h2];
+//  uchar *X=new uchar[h2];
+//  uchar *fX=new uchar[h2];
+  uchar X[h2];
+  uchar fX[h2];
+  
   int ind1,ind2;
 
   
@@ -181,7 +184,7 @@ void encrypt_ctr(uchar* seq_in, uchar *seq_out, int len,uchar* RM1,int *Pbox, in
       printf("\n");
       }*/
     
-    *(int*)&fX[0]=it;
+    *(int*)&fX[0]^=it;
 
     /* if(it<513) {
       for(int a=0;a<h2;a++)
@@ -238,11 +241,16 @@ template<int h2>
 void encrypt(uchar* seq_in, uchar *seq_out, int len,uchar* RM1,int *Pbox, int *PboxRM, uchar *Sbox1, uchar *Sbox2, int debug) {
 
 
-  uchar *X=new uchar[h2];
+/*  uchar *X=new uchar[h2];
   uchar *fX=new uchar[h2];
   unsigned int *lX=(unsigned int*)X;
   unsigned int *lseq_in=(unsigned int*)seq_in;
-
+*/
+  uchar X[h2];
+  uchar fX[h2];
+  unsigned int *lX=(unsigned int*)X;
+  unsigned int *lseq_in=(unsigned int*)seq_in;
+  
 
   for(int it=0;it<len;it++) {
     int ind1=it*h2;
@@ -299,13 +307,19 @@ template<int h2>
 void decrypt(uchar* seq_in, uchar *seq_out, int len,uchar* RM1,int *Pbox, int *PboxRM, uchar *Sbox1, uchar *Sbox2, int debug) {
 
 
-  uchar *fX=new uchar[h2];
+  /*uchar *fX=new uchar[h2];
+  uchar *Inv_Sbox1=new uchar[256];
+  uchar *Inv_Sbox2=new uchar[256];
+  */
+  uchar fX[h2];
+  uchar Inv_Sbox1[256];
+  uchar Inv_Sbox2[256];
 
 
-  uchar *Inv_Sbox1=new uchar[256];
+  
   inverse_tables(Sbox1,256,Inv_Sbox1);
 
-  uchar *Inv_Sbox2=new uchar[256];
+ 
   inverse_tables(Sbox2,256,Inv_Sbox2);
   
 
@@ -372,7 +386,7 @@ int main(int argc, char** argv) {
   for(int i=1; i<argc; i++){
     if(strncmp(argv[i],"nb",2)==0)    nb_test = atoi(&(argv[i][2]));    //nb of test         
     if(strncmp(argv[i],"ctr",3)==0) ctr = atoi(&(argv[i][3]));          //CTR ? 1  otherwise CBC like
-    if(strncmp(argv[i],"h",1)==0) h = atoi(&(argv[i][1]));          //CTR ? 1  otherwise CBC like
+    if(strncmp(argv[i],"h",1)==0) h = atoi(&(argv[i][1]));          //size of block
     if(strncmp(argv[i],"sizebuf",7)==0) size_buf = atoi(&(argv[i][7]));          //SIZE of the buffer
     if(strncmp(argv[i],"lena",4)==0) lena = atoi(&(argv[i][4]));          //Use Lena or buffer
   }
@@ -658,8 +672,10 @@ int main(int argc, char** argv) {
   else {
     bool equal=true;
     for(int i=0;i<imsize;i++) {
-      if(buffer[i]!=seq[i])
+      //cout<<(int)buffer[i]<<endl;
+      if(buffer[i]!=seq[i]) {
        equal=false;
+      }
     }
     cout<<"RESULT CORRECT: "<<equal<<endl;
   }