new

diff --git a/OneRoundIoT/OneRound/rc4_hash2.cpp b/OneRoundIoT/OneRound/rc4_hash2.cpp
index 10f98230d3c74bcabbe36590489545c18e4a1ed4..386ddf77d15bf464348be30ef0b67f41777a563c 100644 (file)
--- a/OneRoundIoT/OneRound/rc4_hash2.cpp
+++ b/OneRoundIoT/OneRound/rc4_hash2.cpp
@@ -168,9 +168,6 @@ void hash_DSD_BIN(uchar* seq_in, uchar* RM1,int len, uchar *S, int h) {
 
   // Goal: Calculate the hash value
   // Output: RM (hash value)
 
   // Goal: Calculate the hash value
   // Output: RM (hash value)

-
-//  uchar *X=new uchar[h2];
-//  uchar *fX=new uchar[h2];

   uchar X[h];
   int ind1,ind2;
 
   uchar X[h];
   int ind1,ind2;
 


@@ -182,8 +179,6 @@ void hash_DSD_BIN(uchar* seq_in, uchar* RM1,int len, uchar *S, int h) {
 
   
   for(int it=0;it<len;it++) {
 
   
   for(int it=0;it<len;it++) {

-    //ind1=Pbox[it]*h;
-    //ind2=Pbox[(it+len/2)]*h;

 
     ind1=(it*h)>>3;
     // Mix with dynamic RM
 
     ind1=(it*h)>>3;
     // Mix with dynamic RM


@@ -192,7 +187,7 @@ void hash_DSD_BIN(uchar* seq_in, uchar* RM1,int len, uchar *S, int h) {
     
     for(int a=0;a<(h>>3);a++) {
        rm[a]=rm[a]^ss[ind1+a];
     
     for(int a=0;a<(h>>3);a++) {
        rm[a]=rm[a]^ss[ind1+a];

-       sum+=rm[a];
+       sum^=rm[a];

      }
 
 
      }
 
 


@@ -200,8 +195,8 @@ void hash_DSD_BIN(uchar* seq_in, uchar* RM1,int len, uchar *S, int h) {
 
      rm[0]=xorshift64(sum);
      for(int a=1;a<(h>>3);a++) {
 
      rm[0]=xorshift64(sum);
      for(int a=1;a<(h>>3);a++) {

-       rm[a]^=xorshift64(rm[a-1]);
-       //rm[a]^=splitmix64(rm[a-1]);
+       rm[a]=xorshift64(rm[a-1]);
+       //rm[a]=splitmix64(rm[a-1]);

      }
 
 
      }
 
 


@@ -303,10 +298,12 @@ int main(int argc, char** argv) {
   if(change==1) {
     
     seq[4]++;
   if(change==1) {
     
     seq[4]++;

+    seq[5]--;

   }
   if(change==2) {
     
     seq[9]++;
   }
   if(change==2) {
     
     seq[9]++;

+    seq[10]--;

   }
 
   printf("seq 4 %d\n",seq[4]);
   }
 
   printf("seq 4 %d\n",seq[4]);

diff --git a/OneRoundIoT/OneRound/rc4_hash3.cpp b/OneRoundIoT/OneRound/rc4_hash3.cpp
index 5c9061c57f62abb7cf8b5d39cadac292c2c5d0c8..07269d03e5dcb2c2758ebd88f1c0fd75e7eba71f 100644 (file)
--- a/OneRoundIoT/OneRound/rc4_hash3.cpp
+++ b/OneRoundIoT/OneRound/rc4_hash3.cpp
@@ -146,15 +146,7 @@ uint64_t xorshift64( const uint64_t state)
   x^= x << 17;
   return x;
 }
   x^= x << 17;
   return x;
 }

-uint xorshift32(const uint t)
-{
-  /* Algorithm "xor" from p. 4 of Marsaglia, "Xorshift RNGs" */
-  uint x = t;
-  x ^= x << 13;
-  x ^= x >> 17;
-  x ^= x << 5;
-  return x;
-}
+

 
 static inline uint64_t splitmix64(uint64_t index) {
   uint64_t z = (index + UINT64_C(0x9E3779B97F4A7C15));
 
 static inline uint64_t splitmix64(uint64_t index) {
   uint64_t z = (index + UINT64_C(0x9E3779B97F4A7C15));


@@ -176,49 +168,26 @@ void hash_DSD_BIN(uchar* seq_in, uchar* RM1,int len, uchar *S, int h) {
 
   // Goal: Calculate the hash value
   // Output: RM (hash value)
 
   // Goal: Calculate the hash value
   // Output: RM (hash value)

-
-//  uchar *X=new uchar[h2];
-//  uchar *fX=new uchar[h2];

   uchar X[h];
   int ind1,ind2;
 
 
   uchar X[h];
   int ind1,ind2;
 
 

-  uint32_t *rm=(uint32_t*)RM1;
-  uint32_t *xx=(uint32_t*)X;
-  uint32_t *ss=(uint32_t*)seq_in;
+  uint64_t *rm=(uint64_t*)RM1;
+  //  uint64_t *xx=(uint64_t*)X;
+  uint64_t *ss=(uint64_t*)seq_in;

 
 
 
 

-  
+  int a;

   for(int it=0;it<len;it++) {
   for(int it=0;it<len;it++) {

-    //ind1=Pbox[it]*h;
-    //ind2=Pbox[(it+len/2)]*h;
-
-    ind1=it*h/4;
+    ind1=(it*h)>>3;

     // Mix with dynamic RM
     // Mix with dynamic RM

-    uint64_t sum=0;
-    /*     for(int a=0;a<h;a+=4) {
-       X[a]=RM1[a]^seq_in[ind1+a];
-       X[a+1]=RM1[a+1]^seq_in[ind1+a+1];
-       X[a+2]=RM1[a+2]^seq_in[ind1+a+2];
-       X[a+3]=RM1[a+3]^seq_in[ind1+a+3];
-     }
-    */
-
-    
-     for(int a=0;a<h/4;a++) {
-       xx[a]=rm[a]^ss[ind1+a];
-       sum+=xx[a];
-     }
-
-
-
-
-     rm[0]=xorshift32(sum);
-     for(int a=1;a<h/4;a++) {
-       rm[a]^=xorshift32(rm[a-1]);
-     }
-
-
+    rm[0]=rm[0]^ss[ind1];
+    rm[0]=xorshift64(rm[0] );
+    for(a=1;a<(h>>3);a++) {
+      rm[a]=rm[a]^ss[ind1+a];
+      rm[a]=xorshift64(rm[a] ^ rm[a-1]);
+    }
+    rm[0]=xorshift64(rm[a] ^ rm[0] );

   }
 
  
   }
 
  


@@ -317,10 +286,12 @@ int main(int argc, char** argv) {
   if(change==1) {
     
     seq[4]++;
   if(change==1) {
     
     seq[4]++;

+    seq[5]--;

   }
   if(change==2) {
     
     seq[9]++;
   }
   if(change==2) {
     
     seq[9]++;

+    seq[10]--;

   }
 
   printf("seq 4 %d\n",seq[4]);
   }
 
   printf("seq 4 %d\n",seq[4]);