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 6a26c6e4efb6ca2d65bab2fe762edb3c044d609a..9c58017ff97eec8e0c02d72273ce52cbfbe6fb00 100644 (file)
--- a/OneRoundIoT/OneRound/one_round_new.cpp
+++ b/OneRoundIoT/OneRound/one_round_new.cpp
@@ -123,7 +123,7 @@ void prga(uchar *sc, int ldata, uchar *r) {
   uchar j0=0;
 
   for (int it=0; it<ldata; it++) {
-    i0 = ((i0+1)%255);
+    i0 = ((i0+1)&0xFE); //%255);
     j0 = (j0 + sc[i0])&0xFF;
     uchar tmp = sc[i0];
     sc[i0] = sc[j0];
@@ -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;
@@ -296,18 +304,14 @@ void encrypt(uchar* seq_in, uchar *seq_out, int len,uchar* RM1,int *Pbox, int *P
 
 
 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];
+void decrypt(uchar* seq_in, uchar *seq_out, int len,uchar* RM1,int *Pbox, int *PboxRM, uchar *Inv_Sbox1, uchar *Inv_Sbox2, int debug) {
 
 
+  /*uchar *fX=new uchar[h2];
   uchar *Inv_Sbox1=new uchar[256];
-  inverse_tables(Sbox1,256,Inv_Sbox1);
-
   uchar *Inv_Sbox2=new uchar[256];
-  inverse_tables(Sbox2,256,Inv_Sbox2);
-  
+  */
+  uchar fX[h2];
 
 
 
@@ -364,23 +368,31 @@ int main(int argc, char** argv) {
 
 
   int h=32;
+  int lena=0;
+  int size_buf=1;
+
+
   
   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
   }
 
-  printf("nb times %d\n",nb_test);
+/*  printf("nb times %d\n",nb_test);
   printf("ctr %d\n",ctr);
   printf("h %d\n",h);
-
+  printf("lena %d\n",lena);
+  printf("size_buf %d\n",size_buf);
+*/
   int h2=h*h;
   
 
       
   int seed=time(NULL);
-  cout<<seed<<endl;
+//  cout<<seed<<endl;
   srand48(seed);
 
   uchar Secretkey[key_size];
@@ -401,23 +413,44 @@ int main(int argc, char** argv) {
 
   int width;
   int height;
+
   uchar *data_R, *data_G, *data_B;
-  load_RGB_pixmap("lena.ppm", &width, &height, &data_R, &data_G, &data_B);
+  int imsize;
+  uchar *buffer;
+  
+  if(lena==1) {
+    load_RGB_pixmap("lena.ppm", &width, &height, &data_R, &data_G, &data_B);
+    imsize=width*height*3;
 //  load_RGB_pixmap("No_ecb_mode_picture.ppm", &width, &height, &data_R, &data_G, &data_B);
+  }
+  else {
+    width=height=size_buf;
+    imsize=width*height;
+    buffer=new uchar[imsize];
+    for(int i=0;i<imsize;i++) {
+      buffer[i]=lrand48();
+    }
+  }
 
 
 
-
   
-  int imsize=width*height*3;
+  
   uchar* seq= new uchar[imsize];
   uchar* seq2= new uchar[imsize];
 
   int oneD=width*height;
-  for(int i=0;i<oneD;i++) {
-    seq[i]=data_R[i];
-    seq[oneD+i]=data_G[i];
-    seq[2*oneD+i]=data_B[i];
+  if(lena) {
+    for(int i=0;i<oneD;i++) {
+      seq[i]=data_R[i];
+      seq[oneD+i]=data_G[i];
+      seq[2*oneD+i]=data_B[i];
+    }
+  }
+  else {
+    for(int i=0;i<oneD;i++) {
+      seq[i]=buffer[i];
+    }
   }
 
 
@@ -440,7 +473,7 @@ int main(int argc, char** argv) {
   }
 
   
-  cout<<"hash "<<endl;
+//  cout<<"hash "<<endl;
   for (int i = 0; i < 64 ; i++) {
 //    DK[i]=digest[i];
     DK[i]=mix[i];
@@ -454,6 +487,11 @@ int main(int argc, char** argv) {
 
   uchar Sbox2[256];
   rc4key(&DK[16], Sbox2, 16);
+  uchar Inv_Sbox1[256];
+  uchar Inv_Sbox2[256];
+  inverse_tables(Sbox1,256,Inv_Sbox1);
+  inverse_tables(Sbox2,256,Inv_Sbox2);
+
 
 
   
@@ -486,7 +524,7 @@ int main(int argc, char** argv) {
 
   rc4keyperm(keyp, len, rp, Pbox, 16);
 
-  printf("len %d\n",len);
+//  printf("len %d\n",len);
   for(int i=0;i<len;i++) {
 //    printf("%d \n",Pbox[i]);
   }
@@ -496,8 +534,7 @@ int main(int argc, char** argv) {
   for(int i=0;i<h2;i++){
     RM2[i]=RM1[i];
   }
-  int *Inv_Pbox=new int[len];
-  inverse_tables_int(Pbox,len,Inv_Pbox);
+
   
  
  double time=0;
@@ -543,6 +580,16 @@ int main(int argc, char** argv) {
       else
        encrypt<32*32>(seq, seq2,len,RM1,Pbox,PboxRM,Sbox1,Sbox2,0);
       
+    }
+    break;
+  case 64: 
+    for(i=0;i<nb_test;i++)
+    {
+      if(ctr)
+       encrypt_ctr<64*64>(seq, seq2,len,RM1,Pbox,PboxRM,Sbox1,Sbox2,1);
+      else
+       encrypt<64*64>(seq, seq2,len,RM1,Pbox,PboxRM,Sbox1,Sbox2,0);
+      
     }
     break;
   }
@@ -550,12 +597,14 @@ int main(int argc, char** argv) {
   cout<<"Time encrypt "<<time<<endl;
 
 
-  for(int i=0;i<oneD;i++) {
-    data_R[i]=seq2[i];
-    data_G[i]=seq2[oneD+i];
-    data_B[i]=seq2[2*oneD+i];
+  if(lena) {
+    for(int i=0;i<oneD;i++) {
+      data_R[i]=seq2[i];
+      data_G[i]=seq2[oneD+i];
+      data_B[i]=seq2[2*oneD+i];
+    }
+    store_RGB_pixmap("lena2.ppm", data_R, data_G, data_B, width, height);
   }
-  store_RGB_pixmap("lena2.ppm", data_R, data_G, data_B, width, height);                    
   
 
   time=0;
@@ -566,7 +615,7 @@ int main(int argc, char** argv) {
       if(ctr)
        encrypt_ctr<4*4>(seq2, seq,len,RM2,Pbox,PboxRM,Sbox1,Sbox2,0);
       else
-       decrypt<4*4>(seq2,seq,len,RM2,Pbox,PboxRM,Sbox1,Sbox2,0);
+       decrypt<4*4>(seq2,seq,len,RM2,Pbox,PboxRM,Inv_Sbox1,Inv_Sbox2,0);
     }
     break;
   case 8:
@@ -574,7 +623,7 @@ int main(int argc, char** argv) {
       if(ctr)
        encrypt_ctr<8*8>(seq2, seq,len,RM2,Pbox,PboxRM,Sbox1,Sbox2,0);
       else
-       decrypt<8*8>(seq2,seq,len,RM2,Pbox,PboxRM,Sbox1,Sbox2,0);
+       decrypt<8*8>(seq2,seq,len,RM2,Pbox,PboxRM,Inv_Sbox1,Inv_Sbox2,0);
     }
     break;
   case 16:
@@ -582,7 +631,7 @@ int main(int argc, char** argv) {
       if(ctr)
        encrypt_ctr<16*16>(seq2, seq,len,RM2,Pbox,PboxRM,Sbox1,Sbox2,0);
       else
-       decrypt<16*16>(seq2,seq,len,RM2,Pbox,PboxRM,Sbox1,Sbox2,0);
+       decrypt<16*16>(seq2,seq,len,RM2,Pbox,PboxRM,Inv_Sbox1,Inv_Sbox2,0);
     }
     break;
   case 32:
@@ -590,7 +639,15 @@ int main(int argc, char** argv) {
       if(ctr)
        encrypt_ctr<32*32>(seq2, seq,len,RM2,Pbox,PboxRM,Sbox1,Sbox2,0);
       else
-       decrypt<32*32>(seq2,seq,len,RM2,Pbox,PboxRM,Sbox1,Sbox2,0);
+       decrypt<32*32>(seq2,seq,len,RM2,Pbox,PboxRM,Inv_Sbox1,Inv_Sbox2,0);
+    }
+    break;
+  case 64:
+    for(i=0;i<nb_test;i++) {
+      if(ctr)
+       encrypt_ctr<64*64>(seq2, seq,len,RM2,Pbox,PboxRM,Sbox1,Sbox2,0);
+      else
+       decrypt<64*64>(seq2,seq,len,RM2,Pbox,PboxRM,Inv_Sbox1,Inv_Sbox2,0);
     }
     break;
   }
@@ -598,13 +655,24 @@ int main(int argc, char** argv) {
   time+=TimeStop(t);
   cout<<"Time decrypt "<<time<<endl;
 
-  
-  for(int i=0;i<oneD;i++) {
-    data_R[i]=seq[i];
-    data_G[i]=seq[oneD+i];
-    data_B[i]=seq[2*oneD+i];
+  if(lena) {
+    for(int i=0;i<oneD;i++) {
+      data_R[i]=seq[i];
+      data_G[i]=seq[oneD+i];
+      data_B[i]=seq[2*oneD+i];
+    }
+    store_RGB_pixmap("lena3.ppm", data_R, data_G, data_B, width, height);
+  }
+  else {
+    bool equal=true;
+    for(int i=0;i<imsize;i++) {
+      //cout<<(int)buffer[i]<<endl;
+      if(buffer[i]!=seq[i]) {
+       equal=false;
+      }
+    }
+//    cout<<"RESULT CORRECT: "<<equal<<endl;
   }
-  store_RGB_pixmap("lena3.ppm", data_R, data_G, data_B, width, height);