X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/Cipher_code.git/blobdiff_plain/ff9e923170329eacc0f53ba1c9673622b6f8b5a2..df8ace786c7b6475a1f43a3a87378197030a2a22:/OneRoundHash/oneroundhash.cpp?ds=sidebyside

diff --git a/OneRoundHash/oneroundhash.cpp b/OneRoundHash/oneroundhash.cpp
index 642dc07..864961d 100644
--- a/OneRoundHash/oneroundhash.cpp
+++ b/OneRoundHash/oneroundhash.cpp
@@ -746,7 +746,7 @@ void decrypt_authenticate_algorithm_2Blocks_V2(uchar* seq_in, uchar *seq_out,  i
 }
 
 template<int h>
-void encrypt_authenticate_algorithm_2Blocks_V3(uchar* seq_in, uchar *seq_out,  int len, uchar* RM, int *Pbox, int *PboxSRM, uchar *Sbox1, uchar *Sbox2, uchar* IV,mylong myrand) {
+void encrypt_authenticate_algorithm_2Blocks_V3(uchar* seq_in, uchar *seq_out,  int len, uchar* RM, int *Pbox, int *PboxSRM, uchar *Sbox1, uchar *Sbox2, uchar* IV,uchar* MAC,mylong myrand) {
   uchar RM1[h];
   uchar tmp1[h];
   mylong *rm1=(mylong*)RM1;
@@ -791,16 +791,16 @@ void encrypt_authenticate_algorithm_2Blocks_V3(uchar* seq_in, uchar *seq_out,  i
 
   }
     for(int a=0;a<h;a+=4) {
-      IV[a]=Sbox2[IV[a]];
-      IV[a+1]=Sbox2[IV[a+1]];
-      IV[a+2]=Sbox2[IV[a+2]];
-      IV[a+3]=Sbox2[IV[a+3]];
+      MAC[a]=Sbox2[IV[a]];
+      MAC[a+1]=Sbox2[IV[a+1]];
+      MAC[a+2]=Sbox2[IV[a+2]];
+      MAC[a+3]=Sbox2[IV[a+3]];
   }
 }
 
 
 template<int h>
-void decrypt_authenticate_algorithm_2Blocks_V3(uchar* seq_in, uchar *seq_out,  int len, uchar* RM, int *Pbox, int *PboxSRM, uchar *Inv_Sbox1, uchar *Inv_Sbox2 ,uchar *Sbox1, uchar *Sbox2, uchar* IV,mylong myrand) {
+void decrypt_authenticate_algorithm_2Blocks_V3(uchar* seq_in, uchar *seq_out,  int len, uchar* RM, int *Pbox, int *PboxSRM, uchar *Inv_Sbox1, uchar *Inv_Sbox2 ,uchar *Sbox1, uchar *Sbox2, uchar* IV,uchar* MAC,mylong myrand) {
   uchar RM1[h];
   uchar tmp1[h];
   mylong *rm1=(mylong*)RM1;
@@ -844,10 +844,10 @@ void decrypt_authenticate_algorithm_2Blocks_V3(uchar* seq_in, uchar *seq_out,  i
 
   }
   for(int a=0;a<h;a+=4) {
-    IV[a]=Sbox2[IV[a]];
-    IV[a+1]=Sbox2[IV[a+1]];
-    IV[a+2]=Sbox2[IV[a+2]];
-    IV[a+3]=Sbox2[IV[a+3]];
+    MAC[a]=Sbox2[IV[a]];
+    MAC[a+1]=Sbox2[IV[a+1]];
+    MAC[a+2]=Sbox2[IV[a+2]];
+    MAC[a+3]=Sbox2[IV[a+3]];
   }
 }
 
@@ -1003,8 +1003,10 @@ int main(int argc, char** argv) {
   uchar RM[h*h*2+256];
   uchar IV1[h];
   uchar IV2[h];
-  uchar MAC[2*h];
+  uchar MAC[h];
 
+
+  
   mylong myrand=0;
  
 
@@ -1014,6 +1016,14 @@ int main(int argc, char** argv) {
 
   double t=TimeStart();  
 
+  for(int i=0;i<h;i++) {
+    IV1[i]=i;
+    IV2[i]=i;
+    MAC[i]=i;
+  }
+    
+
+  
   for(int i=0;i<nb_test;i++) {
 
     rc4key(DK, Sbox1, 8);
@@ -1075,19 +1085,22 @@ int main(int argc, char** argv) {
 
   int i;
   switch(h) {
-    /*  case 16: 
+
+  case 16: 
     for(i=0;i<nb_test;i++)
     {
-      if(cbcprng)
-	encrypt_cbc_prng<16>(seq, seq2,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,IV,myrand,0);
-      if(cbcrm)
-	encrypt_cbc_rm<16>(seq, seq2,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,IV,0);
-      if(ecbrm)
-	encrypt_ecb_rm<16>(seq, seq2,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,IV,0);
-      if(ecbprng)
-	encrypt_ecb_prng<16>(seq, seq2,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,IV,myrand,0);
-    }
-    break;*/
+      if(v1b)
+	encrypt_authenticate_algorithm<16>(seq, seq2, len, RM, Pbox, PboxSRM, Sbox1, Sbox2, IV1, MAC, myrand);
+      if(v2b1)
+	encrypt_authenticate_algorithm_2Blocks<16>(seq, seq2,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,IV1,IV2,MAC,myrand);
+      if(v2b2)
+	encrypt_authenticate_algorithm_2Blocks_V2<16>(seq, seq2,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,IV1,IV2,MAC,myrand);
+      if(v2b3)
+	encrypt_authenticate_algorithm_2Blocks_V3<16>(seq, seq2,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,IV1,MAC,myrand);
+    }
+    break;
+
+    
   case 32: 
     for(i=0;i<nb_test;i++)
     {
@@ -1098,9 +1111,26 @@ int main(int argc, char** argv) {
       if(v2b2)
 	encrypt_authenticate_algorithm_2Blocks_V2<32>(seq, seq2,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,IV1,IV2,MAC,myrand);
       if(v2b3)
-	encrypt_authenticate_algorithm_2Blocks_V3<32>(seq, seq2,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,IV1,myrand);
+	encrypt_authenticate_algorithm_2Blocks_V3<32>(seq, seq2,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,IV1,MAC,myrand);
     }
     break;
+
+  case 64: 
+    for(i=0;i<nb_test;i++)
+    {
+      if(v1b)
+	encrypt_authenticate_algorithm<64>(seq, seq2, len, RM, Pbox, PboxSRM, Sbox1, Sbox2, IV1, MAC, myrand);
+      if(v2b1)
+	encrypt_authenticate_algorithm_2Blocks<64>(seq, seq2,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,IV1,IV2,MAC,myrand);
+      if(v2b2)
+	encrypt_authenticate_algorithm_2Blocks_V2<64>(seq, seq2,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,IV1,IV2,MAC,myrand);
+      if(v2b3)
+	encrypt_authenticate_algorithm_2Blocks_V3<64>(seq, seq2,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,IV1,MAC,myrand);
+    }
+    break;
+
+
+
   }
 
 
@@ -1108,6 +1138,10 @@ int main(int argc, char** argv) {
   cout<<"Time encrypt "<<time_encrypt<<endl;
   cout<<(double)imsize*nb_test/time_encrypt<<"\t";
 
+  /*  for(int i=0;i<h;i++)
+    printf("%d ",MAC[i]);
+  printf("\n");
+  */
 
   if(lena) {
     for(int i=0;i<oneD;i++) {
@@ -1118,24 +1152,31 @@ int main(int argc, char** argv) {
     store_RGB_pixmap("lena2.ppm", data_R, data_G, data_B, width, height);
   }
 
+  for(int i=0;i<h;i++) {
+    IV1[i]=i;
+    IV2[i]=i;
+    MAC[i]=i;
+  }
 
+  
   xorseed=myrand;
   // lehmer64_seed(myrand);
   time_decrypt=0;
   t=TimeStart();
   switch(h) {
-    /*  case 16:
+  case 16:
     for(i=0;i<nb_test;i++) {
-      if(cbcprng)
-	decrypt_cbc_prng<16>(seq2,seq,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,Inv_Sbox1,Inv_Sbox2,IV,myrand,0);
-      if(cbcrm)
-	decrypt_cbc_rm<16>(seq2,seq,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,Inv_Sbox1,Inv_Sbox2,IV,0);
-      if(ecbrm)
-	decrypt_ecb_rm<16>(seq2,seq,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,Inv_Sbox1,Inv_Sbox2,IV,0);
-      if(ecbprng)
-	decrypt_ecb_prng<16>(seq2,seq,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,Inv_Sbox1,Inv_Sbox2,IV,myrand,0);
-    }
-    break;*/
+      if(v1b)
+	decrypt_authenticate_algorithm<16>(seq2, seq,len,RM,Pbox,PboxSRM,Inv_Sbox1,Inv_Sbox2,Sbox1,Sbox2,IV1,MAC,myrand);
+      if(v2b1)
+	decrypt_authenticate_algorithm_2Blocks<16>(seq2, seq,len,RM,Pbox,PboxSRM,Inv_Sbox1,Inv_Sbox2,Sbox1,Sbox2,IV1,IV2,MAC,myrand);
+      if(v2b2)
+	decrypt_authenticate_algorithm_2Blocks_V2<16>(seq2, seq,len,RM,Pbox,PboxSRM,Inv_Sbox1,Inv_Sbox2,Sbox1,Sbox2,IV1,IV2,MAC,myrand);
+      if(v2b3)
+	decrypt_authenticate_algorithm_2Blocks_V3<16>(seq2, seq,len,RM,Pbox,PboxSRM,Inv_Sbox1,Inv_Sbox2,Sbox1,Sbox2,IV1,MAC,myrand);
+    }
+    break;
+
   case 32:
     for(i=0;i<nb_test;i++) {
       if(v1b)
@@ -1145,17 +1186,39 @@ int main(int argc, char** argv) {
       if(v2b2)
 	decrypt_authenticate_algorithm_2Blocks_V2<32>(seq2, seq,len,RM,Pbox,PboxSRM,Inv_Sbox1,Inv_Sbox2,Sbox1,Sbox2,IV1,IV2,MAC,myrand);
       if(v2b3)
-	decrypt_authenticate_algorithm_2Blocks_V3<32>(seq2, seq,len,RM,Pbox,PboxSRM,Inv_Sbox1,Inv_Sbox2,Sbox1,Sbox2,IV1,myrand);
+	decrypt_authenticate_algorithm_2Blocks_V3<32>(seq2, seq,len,RM,Pbox,PboxSRM,Inv_Sbox1,Inv_Sbox2,Sbox1,Sbox2,IV1,MAC,myrand);
     }
     break;
+
+  case 64:
+    for(i=0;i<nb_test;i++) {
+      if(v1b)
+	decrypt_authenticate_algorithm<64>(seq2, seq,len,RM,Pbox,PboxSRM,Inv_Sbox1,Inv_Sbox2,Sbox1,Sbox2,IV1,MAC,myrand);
+      if(v2b1)
+	decrypt_authenticate_algorithm_2Blocks<64>(seq2, seq,len,RM,Pbox,PboxSRM,Inv_Sbox1,Inv_Sbox2,Sbox1,Sbox2,IV1,IV2,MAC,myrand);
+      if(v2b2)
+	decrypt_authenticate_algorithm_2Blocks_V2<64>(seq2, seq,len,RM,Pbox,PboxSRM,Inv_Sbox1,Inv_Sbox2,Sbox1,Sbox2,IV1,IV2,MAC,myrand);
+      if(v2b3)
+	decrypt_authenticate_algorithm_2Blocks_V3<64>(seq2, seq,len,RM,Pbox,PboxSRM,Inv_Sbox1,Inv_Sbox2,Sbox1,Sbox2,IV1,MAC,myrand);
+    }
+    break;
+
+
+
+
   }
 
 
+
   
   time_decrypt+=TimeStop(t);
 //  cout<<"Time decrypt "<<time_decrypt<<endl;
   cout<<(double)imsize*nb_test/time_decrypt<<"\t";
-
+  /*  for(int i=0;i<h;i++)
+    printf("%d ",MAC[i]);
+  printf("\n");
+  */
+  
   if(lena) {
     for(int i=0;i<oneD;i++) {
       data_R[i]=seq[i];