X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/Cipher_code.git/blobdiff_plain/baa3ba339cf98c71a013ab96c1af552e82470efe..f6a8395dc6bbfc631a9f53b35fe3970a3749a48a:/OneRoundIoT/OneRound/one_round_new.cpp?ds=sidebyside

diff --git a/OneRoundIoT/OneRound/one_round_new.cpp b/OneRoundIoT/OneRound/one_round_new.cpp
index 95c602e..9066eaf 100644
--- a/OneRoundIoT/OneRound/one_round_new.cpp
+++ b/OneRoundIoT/OneRound/one_round_new.cpp
@@ -6,6 +6,7 @@
 #include<math.h>
 #include<stdlib.h>
 #include<stdio.h>
+#include<string.h>
 #include <fstream>
 #include <sys/time.h>
 
@@ -27,9 +28,11 @@ using namespace std;
 
 
 int key_size=256;
+int nb_test=1;
+int ctr=0;
+const int h=32;
 
 
-const int h=16;
 const int h2=h*h;
 
 
@@ -66,6 +69,14 @@ void inverse_tables(uchar *tab, int size_tab,uchar *inv_perm_tabs) {
 
 }
 
+void inverse_tables_int(int *tab, int size_tab,int *inv_perm_tabs) {
+
+  for(int i=0;i<size_tab;i++) {
+    inv_perm_tabs[tab[i]] = i;
+  }
+
+}
+
 
 
 void rc4key(uchar *key, uchar *sc, int size_DK) {
@@ -125,6 +136,103 @@ void prga(uchar *sc, int ldata, uchar *r) {
 
 
 
+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];
+  int ind1,ind2;
+
+  
+   for(int a=0;a<h2;a++) {
+     X[a]=Sbox1[a&0xFF];           //Warning according to the size of h2, we can be outsize of Sbox1[a]
+   }
+
+   
+  for(int it=0;it<len;it++) {
+    if(enc) {
+      ind1=it*h2;
+      ind2=Pbox[it]*h2;
+    }
+    else {
+      ind2=it*h2;
+      ind1=Pbox[it]*h2;
+    }
+       
+
+
+    /*for(int a=0;a<h2;a+=4){
+      fX[a]=RM1[X[a]];
+      fX[a+1]=RM1[X[a+1]];
+      fX[a+2]=RM1[X[a+2]];
+      fX[a+3]=RM1[X[a+3]];
+      }*/
+
+    for(int a=0;a<h2;a+=4){
+      fX[a]=X[a];
+      fX[a+1]=X[a+1];
+      fX[a+2]=X[a+2];
+      fX[a+3]=X[a+3];
+    }
+
+    /*   if(it<513) {
+      for(int a=0;a<h2;a++)
+	printf("%d ",fX[a]);
+      printf("\n");
+      }*/
+    
+    *(int*)&fX[0]=it;
+
+    /* if(it<513) {
+      for(int a=0;a<h2;a++)
+	printf("%d ",fX[a]);
+      printf("\n");
+      }*/
+
+    for(int a=0;a<h2;a+=4) {
+      fX[a]=fX[a]^RM1[a];
+      fX[a+1]=fX[a+1]^RM1[a+1];
+      fX[a+2]=fX[a+2]^RM1[a+2];
+      fX[a+3]=fX[a+3]^RM1[a+3];
+    }
+
+ 
+    for(int a=0;a<h2;a+=4) {
+      fX[a]=Sbox2[fX[a]];
+      fX[a+1]=Sbox2[fX[a+1]];
+      fX[a+2]=Sbox2[fX[a+2]];
+      fX[a+3]=Sbox2[fX[a+3]];
+    }
+    
+     for(int a=0;a<h2;a+=4) {
+      fX[a]=fX[a]^seq_in[ind2+a];
+      fX[a+1]=fX[a+1]^seq_in[ind2+a+1];
+      fX[a+2]=fX[a+2]^seq_in[ind2+a+2];
+      fX[a+3]=fX[a+3]^seq_in[ind2+a+3];
+    }
+
+ 
+    for(int a=0;a<h2;a+=4) {
+      seq_out[ind1+a]=fX[a];
+      seq_out[ind1+a+1]=fX[a+1];
+      seq_out[ind1+a+2]=fX[a+2];
+      seq_out[ind1+a+3]=fX[a+3];
+    }
+    
+    for(int a=0;a<h2;a+=4) {
+      RM1[a]=RM1[PboxRM[a]];
+      RM1[a+1]=RM1[PboxRM[a+1]];
+      RM1[a+2]=RM1[PboxRM[a+2]];
+      RM1[a+3]=RM1[PboxRM[a+3]];
+    }
+
+
+    
+  }
+
+
+}
+
 
 
 void encrypt(uchar* seq_in, uchar *seq_out, int len,uchar* RM1,int *Pbox, int *PboxRM, uchar *Sbox1, uchar *Sbox2, int debug) {
@@ -132,37 +240,58 @@ void encrypt(uchar* seq_in, uchar *seq_out, int len,uchar* RM1,int *Pbox, int *P
 
   uchar *X=new uchar[h2];
   uchar *fX=new uchar[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;
     int ind2=Pbox[it]*h2;
 
-    for(int a=0;a<h2;a++) {
+    for(int a=0;a<h2;a+=4) {
       X[a]=seq_in[ind2+a];
+      X[a+1]=seq_in[ind2+a+1];
+      X[a+2]=seq_in[ind2+a+2];
+      X[a+3]=seq_in[ind2+a+3];
     }
 
-    for(int a=0;a<h2;a++){
+    for(int a=0;a<h2;a+=4){
       fX[a]=Sbox1[X[a]];
+      fX[a+1]=Sbox1[X[a+1]];
+      fX[a+2]=Sbox1[X[a+2]];
+      fX[a+3]=Sbox1[X[a+3]];
     }
-    
 
-    for(int a=0;a<h2;a++) {
+
+    for(int a=0;a<h2;a+=4) {
       fX[a]=fX[a]^RM1[a];
+      fX[a+1]=fX[a+1]^RM1[a+1];
+      fX[a+2]=fX[a+2]^RM1[a+2];
+      fX[a+3]=fX[a+3]^RM1[a+3];
     }
 
 
-    for(int a=0;a<h2;a++) {
+    for(int a=0;a<h2;a+=4) {
       seq_out[ind1+a]=Sbox2[fX[a]];
+      seq_out[ind1+a+1]=Sbox2[fX[a+1]];
+      seq_out[ind1+a+2]=Sbox2[fX[a+2]];
+      seq_out[ind1+a+3]=Sbox2[fX[a+3]];
     }
 
-    for(int a=0;a<h2;a++) {
+    for(int a=0;a<h2;a+=4) {
       RM1[a]=RM1[PboxRM[a]];
+      RM1[a+1]=RM1[PboxRM[a+1]];
+      RM1[a+2]=RM1[PboxRM[a+2]];
+      RM1[a+3]=RM1[PboxRM[a+3]];
+
     }
 
-    
+
   }
 
 
+
+
 }
 
 
@@ -190,22 +319,38 @@ void decrypt(uchar* seq_in, uchar *seq_out, int len,uchar* RM1,int *Pbox, int *P
 
 
 
-    for(int a=0;a<h2;a++) {
+    for(int a=0;a<h2;a+=4) {
       fX[a]=seq_in[ind1+a];
+      fX[a+1]=seq_in[ind1+a+1];
+      fX[a+2]=seq_in[ind1+a+2];
+      fX[a+3]=seq_in[ind1+a+3];
+	    
     }
-    for(int a=0;a<h2;a++) {
+    for(int a=0;a<h2;a+=4) {
       fX[a]=Inv_Sbox2[fX[a]];
+      fX[a+1]=Inv_Sbox2[fX[a+1]];
+      fX[a+2]=Inv_Sbox2[fX[a+2]];
+      fX[a+3]=Inv_Sbox2[fX[a+3]];
     }
-    for(int a=0;a<h2;a++) {
+    for(int a=0;a<h2;a+=4) {
       fX[a]=fX[a]^RM1[a];
+      fX[a+1]=fX[a+1]^RM1[a+1];
+      fX[a+2]=fX[a+2]^RM1[a+2];
+      fX[a+3]=fX[a+3]^RM1[a+3];
     }
 
-    for(int a=0;a<h2;a++) {
+    for(int a=0;a<h2;a+=4) {
       RM1[a]=RM1[PboxRM[a]];
+      RM1[a+1]=RM1[PboxRM[a+1]];
+      RM1[a+2]=RM1[PboxRM[a+2]];
+      RM1[a+3]=RM1[PboxRM[a+3]];
     }
     
-    for(int a=0;a<h2;a++) {
+    for(int a=0;a<h2;a+=4) {
       seq_out[ind2+a]=Inv_Sbox1[fX[a]];
+      seq_out[ind2+a+1]=Inv_Sbox1[fX[a+1]];
+      seq_out[ind2+a+2]=Inv_Sbox1[fX[a+2]];
+      seq_out[ind2+a+3]=Inv_Sbox1[fX[a+3]];
     }
 
      
@@ -215,8 +360,37 @@ void decrypt(uchar* seq_in, uchar *seq_out, int len,uchar* RM1,int *Pbox, int *P
 }
 
 
+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
+  }
+
+  printf("nb times %d\n",nb_test);
+  printf("ctr %d\n",ctr);
+  printf("h %d\n",h);
+
+//  h2=h*h;
+  
+
+      
+  int seed=time(NULL);
+  cout<<seed<<endl;
+  srand48(seed);
+
+  uchar Secretkey[key_size];
+
+  uchar counter[key_size];
 
-void Dynamickeygenerationnew(uchar *Secretkey, uchar *counter) {
+  for(int i=0;i<key_size;i++) {
+    Secretkey[i]=lrand48()&0xFF;
+    counter[i]=lrand48()&0xFF;
+  }
+
+  
   int size = 64;
   uchar DK[size];
 
@@ -227,6 +401,7 @@ void Dynamickeygenerationnew(uchar *Secretkey, uchar *counter) {
   int height;
   uchar *data_R, *data_G, *data_B;
   load_RGB_pixmap("lena.ppm", &width, &height, &data_R, &data_G, &data_B);
+//  load_RGB_pixmap("No_ecb_mode_picture.ppm", &width, &height, &data_R, &data_G, &data_B);
 
 
 
@@ -259,14 +434,9 @@ void Dynamickeygenerationnew(uchar *Secretkey, uchar *counter) {
 
     
   for (int i = 0; i < 256 ; i++) {
-//      mix[i]=(int)secret_key.BytePtr()[i]^(int)mycounter.BytePtr()[i];
     mix[i]=Secretkey[i]^counter[i];
   }
 
-/*  byte digest[64];
-  SHA512().CalculateDigest(digest, mix, 256);
-*/
-
   
   cout<<"hash "<<endl;
   for (int i = 0; i < 64 ; i++) {
@@ -308,7 +478,7 @@ void Dynamickeygenerationnew(uchar *Secretkey, uchar *counter) {
   for (int i = 48; i < 64; i++)
     keyp[i-48] = DK[i];
 
-  cout<<len<<endl;
+//  cout<<len<<endl;
   int *Pbox=new int[len];
   int *PboxRM=new int[h2];
 
@@ -316,7 +486,7 @@ void Dynamickeygenerationnew(uchar *Secretkey, uchar *counter) {
 
   printf("len %d\n",len);
   for(int i=0;i<len;i++) {
-    printf("%d \n",Pbox[i]);
+//    printf("%d \n",Pbox[i]);
   }
   
   rc4keyperm(RM2, h2, rp, PboxRM, h2);
@@ -324,15 +494,21 @@ void Dynamickeygenerationnew(uchar *Secretkey, uchar *counter) {
   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;
   double t=TimeStart();
 
   int i;
-  for(i=0;i<100;i++)
+  for(i=0;i<nb_test;i++)
   {
-    encrypt(seq, seq2,len,RM1,Pbox,PboxRM,Sbox1,Sbox2,0);
+    if(ctr)
+      encrypt_ctr(seq, seq2,len,RM1,Pbox,PboxRM,Sbox1,Sbox2,1);
+    else
+      encrypt(seq, seq2,len,RM1,Pbox,PboxRM,Sbox1,Sbox2,0);
+
   }
   
   time+=TimeStop(t);
@@ -349,8 +525,12 @@ void Dynamickeygenerationnew(uchar *Secretkey, uchar *counter) {
 
   time=0;
   t=TimeStart();
-  for(i=0;i<100;i++) {
-    decrypt(seq2,seq,len,RM2,Pbox,PboxRM,Sbox1,Sbox2,0);
+  for(i=0;i<nb_test;i++) {
+    if(ctr)
+      encrypt_ctr(seq2, seq,len,RM2,Pbox,PboxRM,Sbox1,Sbox2,0);
+    else
+      decrypt(seq2,seq,len,RM2,Pbox,PboxRM,Sbox1,Sbox2,0);
+
   }
 
   time+=TimeStop(t);
@@ -366,33 +546,5 @@ void Dynamickeygenerationnew(uchar *Secretkey, uchar *counter) {
   
 
 
-
-
-}
-
-
-
-int main() {
-  cout << "Hello, World!" << endl;
-
-
- 
-
-
-  int seed=time(NULL);
-  cout<<seed<<endl;
-  srand48(seed);
-
-  uchar Secretkey[key_size];
-
-  uchar counter[key_size];
-
-  for(int i=0;i<key_size;i++) {
-    Secretkey[i]=lrand48()&0xFF;
-    counter[i]=lrand48()&0xFF;
-  }
-
-  Dynamickeygenerationnew(Secretkey, counter);
-
   return 0;
 }