X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/Cipher_code.git/blobdiff_plain/137f8adedb33df733dd981cb3d4b68bc6d1c9b33..1dc7a9dac04700865be873c50f6347d48e501ea0:/OneRoundIoT/OneRound/one_round_new.cpp

diff --git a/OneRoundIoT/OneRound/one_round_new.cpp b/OneRoundIoT/OneRound/one_round_new.cpp
index 9046044..6a26c6e 100644
--- a/OneRoundIoT/OneRound/one_round_new.cpp
+++ b/OneRoundIoT/OneRound/one_round_new.cpp
@@ -30,10 +30,10 @@ using namespace std;
 int key_size=256;
 int nb_test=1;
 int ctr=0;
-const int h=32;
 
 
-const int h2=h*h;
+
+
 
 
 
@@ -135,7 +135,7 @@ void prga(uchar *sc, int ldata, uchar *r) {
 
 
 
-
+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) {
 
 
@@ -145,7 +145,7 @@ void encrypt_ctr(uchar* seq_in, uchar *seq_out, int len,uchar* RM1,int *Pbox, in
 
   
    for(int a=0;a<h2;a++) {
-     X[a]=Sbox2[a];
+     X[a]=Sbox1[a&0xFF];           //Warning according to the size of h2, we can be outsize of Sbox1[a]
    }
 
    
@@ -161,14 +161,29 @@ void encrypt_ctr(uchar* seq_in, uchar *seq_out, int len,uchar* RM1,int *Pbox, in
        
 
 
-    for(int a=0;a<h2;a+=4){
+    /*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==0) {
+    /*   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");
@@ -219,7 +234,7 @@ void encrypt_ctr(uchar* seq_in, uchar *seq_out, int len,uchar* RM1,int *Pbox, in
 }
 
 
-
+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) {
 
 
@@ -280,7 +295,7 @@ 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) {
 
 
@@ -348,17 +363,19 @@ void decrypt(uchar* seq_in, uchar *seq_out, int len,uchar* RM1,int *Pbox, int *P
 int main(int argc, char** argv) {
 
 
+  int h=32;
+  
   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]));          //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 h2=h*h;
   
 
       
@@ -487,15 +504,48 @@ int main(int argc, char** argv) {
   double t=TimeStart();
 
   int i;
-  for(i=0;i<nb_test;i++)
-  {
-    if(ctr)
-      encrypt_ctr(seq, seq2,len,RM1,Pbox,PboxRM,Sbox1,Sbox2,1);
-    else
-      encrypt(seq, seq2,len,RM1,Pbox,PboxRM,Sbox1,Sbox2,0);
-
+  switch(h) {
+  case 4: 
+    for(i=0;i<nb_test;i++)
+    {
+      if(ctr)
+	encrypt_ctr<4*4>(seq, seq2,len,RM1,Pbox,PboxRM,Sbox1,Sbox2,1);
+      else
+	encrypt<4*4>(seq, seq2,len,RM1,Pbox,PboxRM,Sbox1,Sbox2,0);
+      
+    }
+    break;
+  case 8: 
+    for(i=0;i<nb_test;i++)
+    {
+      if(ctr)
+	encrypt_ctr<8*8>(seq, seq2,len,RM1,Pbox,PboxRM,Sbox1,Sbox2,1);
+      else
+	encrypt<8*8>(seq, seq2,len,RM1,Pbox,PboxRM,Sbox1,Sbox2,0);
+      
+    }
+    break;
+  case 16: 
+    for(i=0;i<nb_test;i++)
+    {
+      if(ctr)
+	encrypt_ctr<16*16>(seq, seq2,len,RM1,Pbox,PboxRM,Sbox1,Sbox2,1);
+      else
+	encrypt<16*16>(seq, seq2,len,RM1,Pbox,PboxRM,Sbox1,Sbox2,0);
+      
+    }
+    break;
+  case 32: 
+    for(i=0;i<nb_test;i++)
+    {
+      if(ctr)
+	encrypt_ctr<32*32>(seq, seq2,len,RM1,Pbox,PboxRM,Sbox1,Sbox2,1);
+      else
+	encrypt<32*32>(seq, seq2,len,RM1,Pbox,PboxRM,Sbox1,Sbox2,0);
+      
+    }
+    break;
   }
-  
   time+=TimeStop(t);
   cout<<"Time encrypt "<<time<<endl;
 
@@ -510,12 +560,39 @@ int main(int argc, char** argv) {
 
   time=0;
   t=TimeStart();
-  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);
-
+  switch(h) {
+  case 4:
+    for(i=0;i<nb_test;i++) {
+      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);
+    }
+    break;
+  case 8:
+    for(i=0;i<nb_test;i++) {
+      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);
+    }
+    break;
+  case 16:
+    for(i=0;i<nb_test;i++) {
+      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);
+    }
+    break;
+  case 32:
+    for(i=0;i<nb_test;i++) {
+      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);
+    }
+    break;
   }
 
   time+=TimeStop(t);