Merge branch 'master' of ssh://info.iut-bm.univ-fcomte.fr/Cipher_code

diff --git a/OneRoundIoT/EnhancedOneRound/enhanced_oneround.cpp b/OneRoundIoT/EnhancedOneRound/enhanced_oneround.cpp
index c895a8ade1df89fd5321ca5f6b705aa35efc738b..e13650b2b55989432935c2ced3c3c48b0f7b2552 100644 (file)
--- a/OneRoundIoT/EnhancedOneRound/enhanced_oneround.cpp
+++ b/OneRoundIoT/EnhancedOneRound/enhanced_oneround.cpp
@@ -1628,9 +1628,9 @@ int main(int argc, char** argv) {
 */
 
 
-  
-  //time+=TimeStop(t);
-  //cout<<"Time initializaton "<<time<<endl;
+  double time_init=0;
+  time_init+=TimeStop(t);
+  cout<<"Time initializaton "<<time_init<<endl;
 
 
 

diff --git a/OneRoundIoT/OneRound/one_round_hash_new3.cpp b/OneRoundIoT/OneRound/one_round_hash_new3.cpp
index b14d8193e2b1a5289b6bf8f23c7b3a72bfb78b93..47052ef02c5b46a6a35bde6dfd2a7b350f45a72f 100644 (file)
--- a/OneRoundIoT/OneRound/one_round_hash_new3.cpp
+++ b/OneRoundIoT/OneRound/one_round_hash_new3.cpp
@@ -163,16 +163,16 @@ void hash_DSD_BIN(uchar* seq_in, uchar* RM1,int len, int *Pbox,int *PboxRM, ucha
 
     // Mix with dynamic RM
 
-    /*
+    
      for(int a=0;a<h;a+=4) {
       RM1[a]=Sbox1[RM1[a]^seq_in[ind1+a]]^seq_in[ind2+a];
       RM1[a+1]=Sbox1[RM1[a+1]^seq_in[ind1+a+1]]^seq_in[ind2+a+1];
       RM1[a+2]=Sbox1[RM1[a+2]^seq_in[ind1+a+2]]^seq_in[ind2+a+2];
       RM1[a+3]=Sbox1[RM1[a+3]^seq_in[ind1+a+3]]^seq_in[ind2+a+3];
     }
-    */
     
-    for(int a=0;a<h;a+=4) {
+    
+    /*  for(int a=0;a<h;a+=4) {
       RM1[a]=RM1[a]^seq_in[ind1+a];
       RM1[a+1]=RM1[a+1]^seq_in[ind1+a+1];
       RM1[a+2]=RM1[a+2]^seq_in[ind1+a+2];
@@ -185,7 +185,7 @@ void hash_DSD_BIN(uchar* seq_in, uchar* RM1,int len, int *Pbox,int *PboxRM, ucha
       RM1[a+2]=Sbox1[RM1[a+2]]^seq_in[ind2+a+2];
       RM1[a+3]=Sbox1[RM1[a+3]]^seq_in[ind2+a+3];
     }
-
+    */