improvement

[Cipher_code.git] / OneRoundIoT / OneRound / one_round_hash_new.cpp

diff --git a/OneRoundIoT/OneRound/one_round_hash_new.cpp b/OneRoundIoT/OneRound/one_round_hash_new.cpp
index a76f70a4034be7dfea44559ff104c03deff2c553..fbb517f053f291e54dccc1a584ff4e8374effb11 100644 (file)
--- a/OneRoundIoT/OneRound/one_round_hash_new.cpp
+++ b/OneRoundIoT/OneRound/one_round_hash_new.cpp
@@ -135,7 +135,7 @@ void prga(uchar *sc, int ldata, uchar *r) {
   }
 }
 
-
+inline uchar  circ(uchar x,int n) {return (x << n) | (x >> (8 - n));}
 
 
 //the proposed hash function, which is based on DSD structure. Sensitivity is ensured by employing the binary diffusion
@@ -186,6 +186,7 @@ void hash_DSD_BIN(uchar* seq_in, uchar* RM1,int len, int *PboxRM, uchar *Sbox1,
 
     for(int a=0;a<h;a+=4) {
       Y[a]=Sbox1[Y[a]];
+      //Y[a]=circ(Y[a],3);
     }
     
     Z[h-1]=Y[h-1]^Y[0];
@@ -195,6 +196,7 @@ void hash_DSD_BIN(uchar* seq_in, uchar* RM1,int len, int *PboxRM, uchar *Sbox1,
 
     for(int a=0;a<h;a+=4) {
       Z[a]=Sbox2[Z[a]];
+      //Z[a]=circ(Z[a],7);
     }
 
     
@@ -410,7 +412,7 @@ int main(int argc, char** argv) {
   
   time+=TimeStop(t);
   cout<<"Hash Time  "<<time<<endl;
-
+  cout<<(double)imsize*nb_test/time<<"\t";
 
   for(int i=0;i<h;i++){
     cout<<(int)RM1[i]<<" ";