X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/Cipher_code.git/blobdiff_plain/e38c16ec01bf23e02c6bc0c7ee5d046f253125d1..a534111c645d9fd09940b10711a53a09a6900dad:/OneRoundIoT/EnhancedOneRound/enhanced_oneround.cpp

diff --git a/OneRoundIoT/EnhancedOneRound/enhanced_oneround.cpp b/OneRoundIoT/EnhancedOneRound/enhanced_oneround.cpp
index 954a127..f14af17 100644
--- a/OneRoundIoT/EnhancedOneRound/enhanced_oneround.cpp
+++ b/OneRoundIoT/EnhancedOneRound/enhanced_oneround.cpp
@@ -31,12 +31,14 @@ using namespace std;
 
 int key_size=256;
 int nb_test=1;
-int cbc=0;
-
-
+int cbcprng=0;
+int cbcrm=0;
+int ecbrm=0;
+int ecbprng=0;
 
 
 
+typedef __uint64_t mylong;
 
 
 typedef unsigned char   uchar;
@@ -72,6 +74,45 @@ uint xorshift32(const uint t)
 }
 
 
+mylong xorseed;
+
+mylong xorshift64()
+{
+        /* Algorithm "xor" from p. 4 of Marsaglia, "Xorshift RNGs" */
+        mylong x = xorseed;
+        x ^= x >> 12; // a
+        x ^= x << 25; // b
+        x ^= x >> 27; // c
+
+
+        return xorseed=x;
+}
+
+/*
+__uint128_t g_lehmer64_state;
+
+inline uint64_t splitmix64_stateless(uint64_t index) {
+  uint64_t z = (index + UINT64_C(0x9E3779B97F4A7C15));
+  z = (z ^ (z >> 30)) * UINT64_C(0xBF58476D1CE4E5B9);
+  z = (z ^ (z >> 27)) * UINT64_C(0x94D049BB133111EB);
+  return z ^ (z >> 31);
+}
+
+
+inline void lehmer64_seed(uint64_t seed) {
+  g_lehmer64_state = (((__uint128_t)splitmix64_stateless(seed)) << 64) +
+                     splitmix64_stateless(seed + 1);
+}
+
+inline uint64_t lehmer64() {
+  g_lehmer64_state *= UINT64_C(0xda942042e4dd58b5);
+  ;
+  return g_lehmer64_state >> 64;
+}
+
+*/
+
+
 
 void inverse_tables(uchar *tab, int size_tab,uchar *inv_perm_tabs) {
 
@@ -135,7 +176,7 @@ void prga(uchar *sc, int ldata, uchar *r) {
   uchar j0=0;
 
   for (int it=0; it<ldata; it++) {
-    i0 = ((i0+1)&0xFE); //%255);
+    i0 = ((i0+1)%255);
     j0 = (j0 + sc[i0])&0xFF;
     uchar tmp = sc[i0];
     sc[i0] = sc[j0];
@@ -149,26 +190,599 @@ void prga(uchar *sc, int ldata, uchar *r) {
 
 
 
-template<int h>
-void encrypt_ecb(uchar* seq_in, uchar *seq_out, int len,uchar* RM, int *Pbox, int *PboxSRM, uchar *Sbox1, uchar *Sbox2, uint myrand, int debug) {
+template<int h>
+void encrypt_ecb_prng(uchar* seq_in, uchar *seq_out, int len,uchar* RM, int *Pbox, int *PboxSRM, uchar *Sbox1, uchar *Sbox2, uchar* IV,mylong myrand, int debug) {
+
+  uchar X[h];
+  uchar Y[h];
+  uchar fX[h];
+  uchar gY[h];
+  uchar RM1[h];
+  uchar RM2[h];
+  uchar tmp[h];
+  mylong *rm1=(mylong*)RM1;
+  mylong *rm2=(mylong*)RM2;
+
+  
+  
+  for(int it=0;it<len/2;it++) {
+    int ind1=Pbox[it]*h;
+    int ind2=Pbox[it+len/2]*h;
+
+    
+    for(int a=0;a<(h>>3);a++) {
+      myrand=xorshift64();
+      rm1[a]=myrand;
+      myrand=xorshift64();
+      rm2[a]=myrand;
+    }  
+
+
+  
+    for(int a=0;a<h;a+=4) {
+      X[a]=seq_in[ind2+a];
+      X[a+1]=seq_in[ind2+a+1];
+      X[a+2]=seq_in[ind2+a+2];
+      X[a+3]=seq_in[ind2+a+3];
+    }
+
+    for(int a=0;a<h;a+=4) {
+      Y[a]=seq_in[ind1+a];
+      Y[a+1]=seq_in[ind1+a+1];
+      Y[a+2]=seq_in[ind1+a+2];
+      Y[a+3]=seq_in[ind1+a+3];
+    }
+
+
+    for(int a=0;a<h;a+=4) {
+      tmp[a]=Sbox1[X[a]^RM1[a]];
+      tmp[a+1]=Sbox1[X[a+1]^RM1[a+1]];
+      tmp[a+2]=Sbox1[X[a+2]^RM1[a+2]];
+      tmp[a+3]=Sbox1[X[a+3]^RM1[a+3]];
+    }
+    
+    for(int a=0;a<h;a+=4) {
+      fX[a]=Sbox2[tmp[a]^Y[a]];
+      fX[a+1]=Sbox2[tmp[a+1]^Y[a+1]];
+      fX[a+2]=Sbox2[tmp[a+2]^Y[a+2]];
+      fX[a+3]=Sbox2[tmp[a+3]^Y[a+3]];
+    }
+
+      
+    /*for(int a=0;a<h;a+=4) {
+      fX[a]=Sbox2[Sbox1[X[a]^RM1[a]]^Y[a]];
+      fX[a+1]=Sbox2[Sbox1[X[a+1]^RM1[a+1]]^Y[a+1]];
+      fX[a+2]=Sbox2[Sbox1[X[a+2]^RM1[a+2]]^Y[a+2]];
+      fX[a+3]=Sbox2[Sbox1[X[a+3]^RM1[a+3]]^Y[a+3]];
+      }
+    */
+
+
+
+    for(int a=0;a<h;a+=4) {
+      tmp[a]=Sbox2[fX[a]^Y[a]];
+      tmp[a+1]=Sbox2[fX[a+1]^Y[a+1]];
+      tmp[a+2]=Sbox2[fX[a+2]^Y[a+2]];
+      tmp[a+3]=Sbox2[fX[a+3]^Y[a+3]];
+
+    }   
+    for(int a=0;a<h;a+=4) {
+      gY[a]=Sbox1[tmp[a]^RM2[a]];
+      gY[a+1]=Sbox1[tmp[a+1]^RM2[a+1]];
+      gY[a+2]=Sbox1[tmp[a+2]^RM2[a+2]];
+      gY[a+3]=Sbox1[tmp[a+3]^RM2[a+3]];
+
+    }   
+    
+    
+    /* for(int a=0;a<h;a+=4) {
+      gY[a]=Sbox1[Sbox2[fX[a]^Y[a]]^RM2[a]];
+      gY[a+1]=Sbox1[Sbox2[fX[a+1]^Y[a+1]]^RM2[a+1]];
+      gY[a+2]=Sbox1[Sbox2[fX[a+2]^Y[a+2]]^RM2[a+2]];
+      gY[a+3]=Sbox1[Sbox2[fX[a+3]^Y[a+3]]^RM2[a+3]];
+
+      } */  
+    
+
+  
+
+
+
+    for(int a=0;a<h;a+=4) {
+      seq_out[ind2+a]=gY[a];
+      seq_out[ind2+a+1]=gY[a+1];
+      seq_out[ind2+a+2]=gY[a+2];
+      seq_out[ind2+a+3]=gY[a+3];
+    }
+
+    for(int a=0;a<h;a+=4) {
+      seq_out[ind1+a]=fX[a];
+      seq_out[ind1+a+1]=fX[a+1];
+      seq_out[ind1+a+2]=fX[a+2];
+      seq_out[ind1+a+3]=fX[a+3];
+    }
+
+
+
+  }
+  
+
+
+
+}
+
+
+
+
+
+
+
+
+template<int h>
+void decrypt_ecb_prng(uchar* seq_in, uchar *seq_out, int len, uchar* RM, int *Pbox, int *PboxSRM, uchar *Sbox1, uchar *Sbox2, uchar *Inv_Sbox1, uchar *Inv_Sbox2,  uchar* IV,mylong myrand, int debug) {
+
+  uchar invfX[h];
+  uchar invgY[h];
+  uchar fX[h];
+  uchar gY[h];
+  uchar RM1[h];
+  uchar RM2[h];
+  uchar tmp[h];
+  mylong *rm1=(mylong*)RM1;
+  mylong *rm2=(mylong*)RM2;
+
+  
+  for(int it=0;it<len/2;it++) {
+    int ind1=Pbox[it]*h;
+    int ind2=Pbox[it+len/2]*h;
+
+
+    for(int a=0;a<(h>>3);a++) {
+      myrand=xorshift64();
+      rm1[a]=myrand;
+      myrand=xorshift64();
+      rm2[a]=myrand;
+    }
+
+
+    
+    for(int a=0;a<h;a+=4) {
+      gY[a]=seq_in[ind2+a];
+      gY[a+1]=seq_in[ind2+a+1];
+      gY[a+2]=seq_in[ind2+a+2];
+      gY[a+3]=seq_in[ind2+a+3];
+    }
+
+    for(int a=0;a<h;a+=4) {
+      fX[a]=seq_in[ind1+a];
+      fX[a+1]=seq_in[ind1+a+1];
+      fX[a+2]=seq_in[ind1+a+2];
+      fX[a+3]=seq_in[ind1+a+3];
+    }
+
+
+
+
+    for(int a=0;a<h;a+=4) {
+      tmp[a]=Inv_Sbox1[gY[a]]^RM2[a];
+      tmp[a+1]=Inv_Sbox1[gY[a+1]]^RM2[a+1];
+      tmp[a+2]=Inv_Sbox1[gY[a+2]]^RM2[a+2];
+      tmp[a+3]=Inv_Sbox1[gY[a+3]]^RM2[a+3];
+    } 
+
+
+    for(int a=0;a<h;a+=4) {
+      invgY[a]=Inv_Sbox2[tmp[a]]^fX[a];
+      invgY[a+1]=Inv_Sbox2[tmp[a+1]]^fX[a+1];
+      invgY[a+2]=Inv_Sbox2[tmp[a+2]]^fX[a+2];
+      invgY[a+3]=Inv_Sbox2[tmp[a+3]]^fX[a+3];
+    } 
+
+
+
+    /*  for(int a=0;a<h;a+=4) {
+      invgY[a]=Inv_Sbox2[Inv_Sbox1[gY[a]]^RM2[a]]^fX[a];
+      invgY[a+1]=Inv_Sbox2[Inv_Sbox1[gY[a+1]]^RM2[a+1]]^fX[a+1];
+      invgY[a+2]=Inv_Sbox2[Inv_Sbox1[gY[a+2]]^RM2[a+2]]^fX[a+2];
+      invgY[a+3]=Inv_Sbox2[Inv_Sbox1[gY[a+3]]^RM2[a+3]]^fX[a+3];
+      } */    
+
+
+
+
+    for(int a=0;a<h;a+=4) {
+      tmp[a]=Inv_Sbox2[fX[a]]^invgY[a];
+      tmp[a+1]=Inv_Sbox2[fX[a+1]]^invgY[a+1];
+      tmp[a+2]=Inv_Sbox2[fX[a+2]]^invgY[a+2];
+      tmp[a+3]=Inv_Sbox2[fX[a+3]]^invgY[a+3];
+
+    }
+    
+    for(int a=0;a<h;a+=4) {
+      invfX[a]=Inv_Sbox1[tmp[a]]^RM1[a];
+      invfX[a+1]=Inv_Sbox1[tmp[a+1]]^RM1[a+1];
+      invfX[a+2]=Inv_Sbox1[tmp[a+2]]^RM1[a+2];
+      invfX[a+3]=Inv_Sbox1[tmp[a+3]]^RM1[a+3];
+
+    }
+
+    
+    /*  
+    for(int a=0;a<h;a+=4) {
+      invfX[a]=Inv_Sbox1[Inv_Sbox2[fX[a]]^invgY[a]]^RM1[a];
+      invfX[a+1]=Inv_Sbox1[Inv_Sbox2[fX[a+1]]^invgY[a+1]]^RM1[a+1];
+      invfX[a+2]=Inv_Sbox1[Inv_Sbox2[fX[a+2]]^invgY[a+2]]^RM1[a+2];
+      invfX[a+3]=Inv_Sbox1[Inv_Sbox2[fX[a+3]]^invgY[a+3]]^RM1[a+3];
+
+    }
+    */
+
+    for(int a=0;a<h;a+=4) {
+      seq_out[ind2+a]=invfX[a];
+      seq_out[ind2+a+1]=invfX[a+1];
+      seq_out[ind2+a+2]=invfX[a+2];
+      seq_out[ind2+a+3]=invfX[a+3];
+    }
+
+    for(int a=0;a<h;a+=4) {
+      seq_out[ind1+a]=invgY[a];
+      seq_out[ind1+a+1]=invgY[a+1];
+      seq_out[ind1+a+2]=invgY[a+2];
+      seq_out[ind1+a+3]=invgY[a+3];
+    }
+
+
+
+  }
+  
+
+
+
+}
+
+
+
+
+
+
+template<int h>
+void encrypt_ecb_rm(uchar* seq_in, uchar *seq_out, int len,uchar* RM, int *Pbox, int *PboxSRM, uchar *Sbox1, uchar *Sbox2, uchar *IV, int debug) {
+
+  uchar X[h];
+  uchar Y[h];
+  uchar fX[h];
+  uchar gY[h];
+  uchar IV1[h];
+  uchar IV2[h];
+  uchar *RM1;
+  uchar *RM2;
+  uchar tmp[h];
+
+
+
+  for(int a=0;a<h;a+=4) {
+    IV1[a]=IV[a];
+    IV1[a+1]=IV[a+1];
+    IV1[a+2]=IV[a+2];
+    IV1[a+3]=IV[a+3];
+  }
+
+
+  for(int a=0;a<h;a+=4) {
+    IV2[a]=IV[h+a];
+    IV2[a+1]=IV[h+a+1];
+    IV2[a+2]=IV[h+a+2];
+    IV2[a+3]=IV[h+a+3];
+
+  }
+
+
+
+
+
+  
+  for(int it=0;it<len/2;it++) {
+    int ind1=Pbox[it]*h;
+    int ind2=Pbox[it+len/2]*h;
+
+
+    RM1=&RM[PboxSRM[it]*h];
+    RM2=&RM[h*h+PboxSRM[len/2-it-1]*h];
+    
+
+  
+    for(int a=0;a<h;a+=4) {
+      X[a]=seq_in[ind2+a];
+      X[a+1]=seq_in[ind2+a+1];
+      X[a+2]=seq_in[ind2+a+2];
+      X[a+3]=seq_in[ind2+a+3];
+    }
+
+    for(int a=0;a<h;a+=4) {
+      Y[a]=seq_in[ind1+a];
+      Y[a+1]=seq_in[ind1+a+1];
+      Y[a+2]=seq_in[ind1+a+2];
+      Y[a+3]=seq_in[ind1+a+3];
+    }
+
+
+    for(int a=0;a<h;a+=4) {
+      tmp[a]=Sbox1[X[a]^RM1[a]];
+      tmp[a+1]=Sbox1[X[a+1]^RM1[a+1]];
+      tmp[a+2]=Sbox1[X[a+2]^RM1[a+2]];
+      tmp[a+3]=Sbox1[X[a+3]^RM1[a+3]];
+    }
+    
+    for(int a=0;a<h;a+=4) {
+      fX[a]=Sbox2[tmp[a]^Y[a]];
+      fX[a+1]=Sbox2[tmp[a+1]^Y[a+1]];
+      fX[a+2]=Sbox2[tmp[a+2]^Y[a+2]];
+      fX[a+3]=Sbox2[tmp[a+3]^Y[a+3]];
+    }
+
+      
+    /*for(int a=0;a<h;a+=4) {
+      fX[a]=Sbox2[Sbox1[X[a]^RM1[a]]^Y[a]];
+      fX[a+1]=Sbox2[Sbox1[X[a+1]^RM1[a+1]]^Y[a+1]];
+      fX[a+2]=Sbox2[Sbox1[X[a+2]^RM1[a+2]]^Y[a+2]];
+      fX[a+3]=Sbox2[Sbox1[X[a+3]^RM1[a+3]]^Y[a+3]];
+      }
+    */
+
+
+
+    for(int a=0;a<h;a+=4) {
+      tmp[a]=Sbox2[fX[a]^Y[a]];
+      tmp[a+1]=Sbox2[fX[a+1]^Y[a+1]];
+      tmp[a+2]=Sbox2[fX[a+2]^Y[a+2]];
+      tmp[a+3]=Sbox2[fX[a+3]^Y[a+3]];
+
+    }   
+    for(int a=0;a<h;a+=4) {
+      gY[a]=Sbox1[tmp[a]^RM2[a]];
+      gY[a+1]=Sbox1[tmp[a+1]^RM2[a+1]];
+      gY[a+2]=Sbox1[tmp[a+2]^RM2[a+2]];
+      gY[a+3]=Sbox1[tmp[a+3]^RM2[a+3]];
+
+    }   
+    
+    
+    /* for(int a=0;a<h;a+=4) {
+      gY[a]=Sbox1[Sbox2[fX[a]^Y[a]]^RM2[a]];
+      gY[a+1]=Sbox1[Sbox2[fX[a+1]^Y[a+1]]^RM2[a+1]];
+      gY[a+2]=Sbox1[Sbox2[fX[a+2]^Y[a+2]]^RM2[a+2]];
+      gY[a+3]=Sbox1[Sbox2[fX[a+3]^Y[a+3]]^RM2[a+3]];
+
+      } */  
+    
+
+  
+
+
+
+    for(int a=0;a<h;a+=4) {
+      seq_out[ind2+a]=gY[a];
+      seq_out[ind2+a+1]=gY[a+1];
+      seq_out[ind2+a+2]=gY[a+2];
+      seq_out[ind2+a+3]=gY[a+3];
+    }
+
+    for(int a=0;a<h;a+=4) {
+      seq_out[ind1+a]=fX[a];
+      seq_out[ind1+a+1]=fX[a+1];
+      seq_out[ind1+a+2]=fX[a+2];
+      seq_out[ind1+a+3]=fX[a+3];
+    }
+
+
+
+  }
+  
+
+
+
+}
+
+
+
+
+
+
+
+
+template<int h>
+void decrypt_ecb_rm(uchar* seq_in, uchar *seq_out, int len, uchar* RM, int *Pbox, int *PboxSRM, uchar *Sbox1, uchar *Sbox2, uchar *Inv_Sbox1, uchar *Inv_Sbox2,  uchar *IV, int debug) {
+
+  uchar invfX[h];
+  uchar invgY[h];
+  uchar fX[h];
+  uchar gY[h];
+  uchar IV1[h];
+  uchar IV2[h];
+  uchar *RM1;
+  uchar *RM2;
+  uchar tmp[h];
+
+  
+
+  for(int a=0;a<h;a+=4) {
+    IV1[a]=IV[a];
+    IV1[a+1]=IV[a+1];
+    IV1[a+2]=IV[a+2];
+    IV1[a+3]=IV[a+3];
+  }
+
+
+  for(int a=0;a<h;a+=4) {
+    IV2[a]=IV[h+a];
+    IV2[a+1]=IV[h+a+1];
+    IV2[a+2]=IV[h+a+2];
+    IV2[a+3]=IV[h+a+3];
+
+  }
+
+
+  
+  for(int it=0;it<len/2;it++) {
+    int ind1=Pbox[it]*h;
+    int ind2=Pbox[it+len/2]*h;
+
+
+    RM1=&RM[PboxSRM[it]*h];
+    RM2=&RM[h*h+PboxSRM[len/2-it-1]*h];
+
+
+    
+    for(int a=0;a<h;a+=4) {
+      gY[a]=seq_in[ind2+a];
+      gY[a+1]=seq_in[ind2+a+1];
+      gY[a+2]=seq_in[ind2+a+2];
+      gY[a+3]=seq_in[ind2+a+3];
+    }
+
+    for(int a=0;a<h;a+=4) {
+      fX[a]=seq_in[ind1+a];
+      fX[a+1]=seq_in[ind1+a+1];
+      fX[a+2]=seq_in[ind1+a+2];
+      fX[a+3]=seq_in[ind1+a+3];
+    }
+
+
+
+
+    for(int a=0;a<h;a+=4) {
+      tmp[a]=Inv_Sbox1[gY[a]]^RM2[a];
+      tmp[a+1]=Inv_Sbox1[gY[a+1]]^RM2[a+1];
+      tmp[a+2]=Inv_Sbox1[gY[a+2]]^RM2[a+2];
+      tmp[a+3]=Inv_Sbox1[gY[a+3]]^RM2[a+3];
+    } 
+
+
+    for(int a=0;a<h;a+=4) {
+      invgY[a]=Inv_Sbox2[tmp[a]]^fX[a];
+      invgY[a+1]=Inv_Sbox2[tmp[a+1]]^fX[a+1];
+      invgY[a+2]=Inv_Sbox2[tmp[a+2]]^fX[a+2];
+      invgY[a+3]=Inv_Sbox2[tmp[a+3]]^fX[a+3];
+    } 
+
+
+
+    /*  for(int a=0;a<h;a+=4) {
+      invgY[a]=Inv_Sbox2[Inv_Sbox1[gY[a]]^RM2[a]]^fX[a];
+      invgY[a+1]=Inv_Sbox2[Inv_Sbox1[gY[a+1]]^RM2[a+1]]^fX[a+1];
+      invgY[a+2]=Inv_Sbox2[Inv_Sbox1[gY[a+2]]^RM2[a+2]]^fX[a+2];
+      invgY[a+3]=Inv_Sbox2[Inv_Sbox1[gY[a+3]]^RM2[a+3]]^fX[a+3];
+      } */    
+
+
+
+
+    for(int a=0;a<h;a+=4) {
+      tmp[a]=Inv_Sbox2[fX[a]]^invgY[a];
+      tmp[a+1]=Inv_Sbox2[fX[a+1]]^invgY[a+1];
+      tmp[a+2]=Inv_Sbox2[fX[a+2]]^invgY[a+2];
+      tmp[a+3]=Inv_Sbox2[fX[a+3]]^invgY[a+3];
+
+    }
+    
+    for(int a=0;a<h;a+=4) {
+      invfX[a]=Inv_Sbox1[tmp[a]]^RM1[a];
+      invfX[a+1]=Inv_Sbox1[tmp[a+1]]^RM1[a+1];
+      invfX[a+2]=Inv_Sbox1[tmp[a+2]]^RM1[a+2];
+      invfX[a+3]=Inv_Sbox1[tmp[a+3]]^RM1[a+3];
+
+    }
+
+    
+    /*  
+    for(int a=0;a<h;a+=4) {
+      invfX[a]=Inv_Sbox1[Inv_Sbox2[fX[a]]^invgY[a]]^RM1[a];
+      invfX[a+1]=Inv_Sbox1[Inv_Sbox2[fX[a+1]]^invgY[a+1]]^RM1[a+1];
+      invfX[a+2]=Inv_Sbox1[Inv_Sbox2[fX[a+2]]^invgY[a+2]]^RM1[a+2];
+      invfX[a+3]=Inv_Sbox1[Inv_Sbox2[fX[a+3]]^invgY[a+3]]^RM1[a+3];
+
+    }
+    */
+
+    for(int a=0;a<h;a+=4) {
+      seq_out[ind2+a]=invfX[a];
+      seq_out[ind2+a+1]=invfX[a+1];
+      seq_out[ind2+a+2]=invfX[a+2];
+      seq_out[ind2+a+3]=invfX[a+3];
+    }
+
+    for(int a=0;a<h;a+=4) {
+      seq_out[ind1+a]=invgY[a];
+      seq_out[ind1+a+1]=invgY[a+1];
+      seq_out[ind1+a+2]=invgY[a+2];
+      seq_out[ind1+a+3]=invgY[a+3];
+    }
+
+
+
+  }
+  
+
+
+
+}
+
+
+
+
+
+
+
+
+
+template<int h>
+void encrypt_cbc_prng(uchar* seq_in, uchar *seq_out, int len,uchar* RM, int *Pbox, int *PboxSRM, uchar *Sbox1, uchar *Sbox2, uchar *IV,uint myrand, int debug) {
+
+  uchar X[h];
+  uchar Y[h];
+  uchar fX[h];
+  uchar gY[h];
+  uchar IV1[h];
+  uchar IV2[h];
+  uchar RM1[h];
+  uchar RM2[h];
+  uchar tmp[h];
+  mylong *rm1=(mylong*)RM1;
+  mylong *rm2=(mylong*)RM2;
+
+
+  
+  for(int a=0;a<h;a+=4) {
+    IV1[a]=IV[a];
+    IV1[a+1]=IV[a+1];
+    IV1[a+2]=IV[a+2];
+    IV1[a+3]=IV[a+3];
+  }
+
+
+  for(int a=0;a<h;a+=4) {
+    IV2[a]=IV[h+a];
+    IV2[a+1]=IV[h+a+1];
+    IV2[a+2]=IV[h+a+2];
+    IV2[a+3]=IV[h+a+3];
+
+  }
 
-  uchar X[h];
-  uchar Y[h];
-  uchar fX[h];
-  uchar gY[h];
-  uchar *RM1;
-  uchar *RM2;
   
   for(int it=0;it<len/2;it++) {
     int ind1=Pbox[it]*h;
     int ind2=Pbox[it+len/2]*h;
 
+    
+    for(int a=0;a<(h>>3);a++) {
+      myrand=xorshift64();
+      rm1[a]=myrand;
+      myrand=xorshift64();
+      rm2[a]=myrand;
+    }  
 
 
-    RM1=&RM[PboxSRM[it]*h];
-    RM2=&RM[h*h+PboxSRM[it]*h];
-
-    
+  
     for(int a=0;a<h;a+=4) {
       X[a]=seq_in[ind2+a];
       X[a+1]=seq_in[ind2+a+1];
@@ -185,20 +799,89 @@ void encrypt_ecb(uchar* seq_in, uchar *seq_out, int len,uchar* RM, int *Pbox, in
 
 
     for(int a=0;a<h;a+=4) {
-      fX[a]=Sbox2[Sbox1[X[a]^RM1[a]]^Y[a]];
-      fX[a+1]=Sbox2[Sbox1[X[a+1]^RM1[a+1]]^Y[a+1]];
-      fX[a+2]=Sbox2[Sbox1[X[a+2]^RM1[a+2]]^Y[a+2]];
-      fX[a+3]=Sbox2[Sbox1[X[a+3]^RM1[a+3]]^Y[a+3]];
+      tmp[a]=X[a]^RM1[a]^IV1[a];
+      tmp[a+1]=X[a+1]^RM1[a+1]^IV1[a+1];
+      tmp[a+2]=X[a+2]^RM1[a+2]^IV1[a+2];
+      tmp[a+3]=X[a+3]^RM1[a+3]^IV1[a+3];
     }
 
     for(int a=0;a<h;a+=4) {
-      gY[a]=Sbox1[Sbox2[fX[a]^Y[a]]^RM2[a]];
-      gY[a+1]=Sbox1[Sbox2[fX[a+1]^Y[a+1]]^RM2[a+1]];
-      gY[a+2]=Sbox1[Sbox2[fX[a+2]^Y[a+2]]^RM2[a+2]];
-      gY[a+3]=Sbox1[Sbox2[fX[a+3]^Y[a+3]]^RM2[a+3]];
+      tmp[a]=Sbox1[tmp[a]];
+      tmp[a+1]=Sbox1[tmp[a+1]];
+      tmp[a+2]=Sbox1[tmp[a+2]];
+      tmp[a+3]=Sbox1[tmp[a+3]];
+    }
+
+    
+    /* for(int a=0;a<h;a+=4) {
+      tmp[a]=Sbox1[X[a]^RM1[a]^IV1[a]];
+      tmp[a+1]=Sbox1[X[a+1]^RM1[a+1]^IV1[a+1]];
+      tmp[a+2]=Sbox1[X[a+2]^RM1[a+2]^IV1[a+2]];
+      tmp[a+3]=Sbox1[X[a+3]^RM1[a+3]^IV1[a+3]];
+      }*/
+
+    for(int a=0;a<h;a+=4) {
+      fX[a]=Sbox2[tmp[a]^Y[a]];
+      fX[a+1]=Sbox2[tmp[a+1]^Y[a+1]];
+      fX[a+2]=Sbox2[tmp[a+2]^Y[a+2]];
+      fX[a+3]=Sbox2[tmp[a+3]^Y[a+3]];
+      }
+
+    
+    /*for(int a=0;a<h;a+=4) {
+      fX[a]=Sbox2[Sbox1[X[a]^RM1[a]^IV1[a]]^Y[a]];
+      fX[a+1]=Sbox2[Sbox1[X[a+1]^RM1[a+1]^IV1[a+1]]^Y[a+1]];
+      fX[a+2]=Sbox2[Sbox1[X[a+2]^RM1[a+2]^IV1[a+2]]^Y[a+2]];
+      fX[a+3]=Sbox2[Sbox1[X[a+3]^RM1[a+3]^IV1[a+3]]^Y[a+3]];
+      }
+    */
+
+ for(int a=0;a<h;a+=4) {
+      tmp[a]=fX[a]^Y[a]^IV2[a];
+      tmp[a+1]=fX[a+1]^Y[a+1]^IV2[a+1];
+      tmp[a+2]=fX[a+2]^Y[a+2]^IV2[a+2];
+      tmp[a+3]=fX[a+3]^Y[a+3]^IV2[a+3];
+
+    }     
+
+ for(int a=0;a<h;a+=4) {
+      tmp[a]=Sbox2[tmp[a]];
+      tmp[a+1]=Sbox2[tmp[a+1]];
+      tmp[a+2]=Sbox2[tmp[a+2]];
+      tmp[a+3]=Sbox2[tmp[a+3]];
+
+    }     
+
+    /*
+    for(int a=0;a<h;a+=4) {
+      tmp[a]=Sbox2[fX[a]^Y[a]^IV2[a]];
+      tmp[a+1]=Sbox2[fX[a+1]^Y[a+1]^IV2[a+1]];
+      tmp[a+2]=Sbox2[fX[a+2]^Y[a+2]^IV2[a+2]];
+      tmp[a+3]=Sbox2[fX[a+3]^Y[a+3]^IV2[a+3]];
+
+    }     
+    */ 
+
+    for(int a=0;a<h;a+=4) {
+      gY[a]=Sbox1[tmp[a]^RM2[a]];
+      gY[a+1]=Sbox1[tmp[a+1]^RM2[a+1]];
+      gY[a+2]=Sbox1[tmp[a+2]^RM2[a+2]];
+      gY[a+3]=Sbox1[tmp[a+3]^RM2[a+3]];
 
     }     
 
+
+
+/*    
+    for(int a=0;a<h;a+=4) {
+      gY[a]=Sbox1[Sbox2[fX[a]^Y[a]^IV2[a]]^RM2[a]];
+      gY[a+1]=Sbox1[Sbox2[fX[a+1]^Y[a+1]^IV2[a+1]]^RM2[a+1]];
+      gY[a+2]=Sbox1[Sbox2[fX[a+2]^Y[a+2]^IV2[a+2]]^RM2[a+2]];
+      gY[a+3]=Sbox1[Sbox2[fX[a+3]^Y[a+3]^IV2[a+3]]^RM2[a+3]];
+
+    } 
+*/  
+
     for(int a=0;a<h;a+=4) {
       seq_out[ind2+a]=gY[a];
       seq_out[ind2+a+1]=gY[a+1];
@@ -212,8 +895,19 @@ void encrypt_ecb(uchar* seq_in, uchar *seq_out, int len,uchar* RM, int *Pbox, in
       seq_out[ind1+a+2]=fX[a+2];
       seq_out[ind1+a+3]=fX[a+3];
     }
+    for(int a=0;a<h;a+=4) {
+      IV1[a]=fX[a];
+      IV1[a+1]=fX[a+1];
+      IV1[a+2]=fX[a+2];
+      IV1[a+3]=fX[a+3];
+    }
 
-
+    for(int a=0;a<h;a+=4) {
+      IV2[a]=gY[a];
+      IV2[a+1]=gY[a+1];
+      IV2[a+2]=gY[a+2];
+      IV2[a+3]=gY[a+3];
+    }
 
   }
   
@@ -230,23 +924,50 @@ void encrypt_ecb(uchar* seq_in, uchar *seq_out, int len,uchar* RM, int *Pbox, in
 
 
 template<int h>
-void decrypt_ecb(uchar* seq_in, uchar *seq_out, int len, uchar* RM, int *Pbox, int *PboxSRM, uchar *Sbox1, uchar *Sbox2, uchar *Inv_Sbox1, uchar *Inv_Sbox2,  uint myrand, int debug) {
+void decrypt_cbc_prng(uchar* seq_in, uchar *seq_out, int len, uchar* RM, int *Pbox, int *PboxSRM, uchar *Sbox1, uchar *Sbox2, uchar *Inv_Sbox1, uchar *Inv_Sbox2, uchar* IV, uint myrand, int debug) {
 
   uchar invfX[h];
   uchar invgY[h];
   uchar fX[h];
   uchar gY[h];
-  uchar *RM1;
-  uchar *RM2;
+  uchar RM1[h];
+  uchar RM2[h];
+  uchar IV1[h];
+  uchar IV2[h];
+  uchar tmp[h];
+  mylong *rm1=(mylong*)RM1;
+  mylong *rm2=(mylong*)RM2;
+
+
+  
+  for(int a=0;a<h;a+=4) {
+    IV1[a]=IV[a];
+    IV1[a+1]=IV[a+1];
+    IV1[a+2]=IV[a+2];
+    IV1[a+3]=IV[a+3];
+  }
+
+
+  for(int a=0;a<h;a+=4) {
+    IV2[a]=IV[h+a];
+    IV2[a+1]=IV[h+a+1];
+    IV2[a+2]=IV[h+a+2];
+    IV2[a+3]=IV[h+a+3];
+
+  }
+
   
   for(int it=0;it<len/2;it++) {
     int ind1=Pbox[it]*h;
     int ind2=Pbox[it+len/2]*h;
 
-
-    RM1=&RM[PboxSRM[it]*h];
-    RM2=&RM[h*h+PboxSRM[it]*h];
-
+    
+    for(int a=0;a<(h>>3);a++) {
+      myrand=xorshift64();
+      rm1[a]=myrand;
+      myrand=xorshift64();
+      rm2[a]=myrand;
+    }  
     
     for(int a=0;a<h;a+=4) {
       gY[a]=seq_in[ind2+a];
@@ -262,23 +983,82 @@ void decrypt_ecb(uchar* seq_in, uchar *seq_out, int len, uchar* RM, int *Pbox, i
       fX[a+3]=seq_in[ind1+a+3];
     }
 
+
     for(int a=0;a<h;a+=4) {
-      invgY[a]=Inv_Sbox2[Inv_Sbox1[gY[a]]^RM2[a]]^fX[a];
-      invgY[a+1]=Inv_Sbox2[Inv_Sbox1[gY[a+1]]^RM2[a+1]]^fX[a+1];
-      invgY[a+2]=Inv_Sbox2[Inv_Sbox1[gY[a+2]]^RM2[a+2]]^fX[a+2];
-      invgY[a+3]=Inv_Sbox2[Inv_Sbox1[gY[a+3]]^RM2[a+3]]^fX[a+3];
-    }     
+      tmp[a]=Inv_Sbox1[gY[a]]^RM2[a];
+      tmp[a+1]=Inv_Sbox1[gY[a+1]]^RM2[a+1];
+      tmp[a+2]=Inv_Sbox1[gY[a+2]]^RM2[a+2];
+      tmp[a+3]=Inv_Sbox1[gY[a+3]]^RM2[a+3];
+    }   
+
+
+    for(int a=0;a<h;a+=4) {
+      tmp[a]=Inv_Sbox2[tmp[a]];
+      tmp[a+1]=Inv_Sbox2[tmp[a+1]];
+      tmp[a+2]=Inv_Sbox2[tmp[a+2]];
+      tmp[a+3]=Inv_Sbox2[tmp[a+3]];
+    }   
 
 
     
     for(int a=0;a<h;a+=4) {
-      invfX[a]=Inv_Sbox1[Inv_Sbox2[fX[a]]^invgY[a]]^RM1[a];
-      invfX[a+1]=Inv_Sbox1[Inv_Sbox2[fX[a+1]]^invgY[a+1]]^RM1[a+1];
-      invfX[a+2]=Inv_Sbox1[Inv_Sbox2[fX[a+2]]^invgY[a+2]]^RM1[a+2];
-      invfX[a+3]=Inv_Sbox1[Inv_Sbox2[fX[a+3]]^invgY[a+3]]^RM1[a+3];
+      invgY[a]=tmp[a]^fX[a]^IV2[a];
+      invgY[a+1]=tmp[a+1]^fX[a+1]^IV2[a+1];
+      invgY[a+2]=tmp[a+2]^fX[a+2]^IV2[a+2];
+      invgY[a+3]=tmp[a+3]^fX[a+3]^IV2[a+3];
+    }   
+
+
+/*
+ for(int a=0;a<h;a+=4) {
+      invgY[a]=Inv_Sbox2[Inv_Sbox1[gY[a]]^RM2[a]]^fX[a]^IV2[a];
+      invgY[a+1]=Inv_Sbox2[Inv_Sbox1[gY[a+1]]^RM2[a+1]]^fX[a+1]^IV2[a+1];
+      invgY[a+2]=Inv_Sbox2[Inv_Sbox1[gY[a+2]]^RM2[a+2]]^fX[a+2]^IV2[a+2];
+      invgY[a+3]=Inv_Sbox2[Inv_Sbox1[gY[a+3]]^RM2[a+3]]^fX[a+3]^IV2[a+3];
+    }   
+*/
+
+    
+    for(int a=0;a<h;a+=4) {
+      tmp[a]=Inv_Sbox2[fX[a]]^invgY[a];
+      tmp[a+1]=Inv_Sbox2[fX[a+1]]^invgY[a+1];
+      tmp[a+2]=Inv_Sbox2[fX[a+2]]^invgY[a+2];
+      tmp[a+3]=Inv_Sbox2[fX[a+3]]^invgY[a+3];
+
+    }
+
+
+    for(int a=0;a<h;a+=4) {
+      tmp[a]=Inv_Sbox1[tmp[a]];
+      tmp[a+1]=Inv_Sbox1[tmp[a+1]];
+      tmp[a+2]=Inv_Sbox1[tmp[a+2]];
+      tmp[a+3]=Inv_Sbox1[tmp[a+3]];
+
+    }
+
+
+
+
+    for(int a=0;a<h;a+=4) {
+      invfX[a]=tmp[a]^RM1[a]^IV1[a];
+      invfX[a+1]=tmp[a+1]^RM1[a+1]^IV1[a+1];
+      invfX[a+2]=tmp[a+2]^RM1[a+2]^IV1[a+2];
+      invfX[a+3]=tmp[a+3]^RM1[a+3]^IV1[a+3];
+
+    }
+
+/*
+ for(int a=0;a<h;a+=4) {
+      invfX[a]=Inv_Sbox1[Inv_Sbox2[fX[a]]^invgY[a]]^RM1[a]^IV1[a];
+      invfX[a+1]=Inv_Sbox1[Inv_Sbox2[fX[a+1]]^invgY[a+1]]^RM1[a+1]^IV1[a+1];
+      invfX[a+2]=Inv_Sbox1[Inv_Sbox2[fX[a+2]]^invgY[a+2]]^RM1[a+2]^IV1[a+2];
+      invfX[a+3]=Inv_Sbox1[Inv_Sbox2[fX[a+3]]^invgY[a+3]]^RM1[a+3]^IV1[a+3];
 
     }
 
+*/
+
+    
 
     for(int a=0;a<h;a+=4) {
       seq_out[ind2+a]=invfX[a];
@@ -293,7 +1073,19 @@ void decrypt_ecb(uchar* seq_in, uchar *seq_out, int len, uchar* RM, int *Pbox, i
       seq_out[ind1+a+2]=invgY[a+2];
       seq_out[ind1+a+3]=invgY[a+3];
     }
+    for(int a=0;a<h;a+=4) {
+      IV1[a]=fX[a];
+      IV1[a+1]=fX[a+1];
+      IV1[a+2]=fX[a+2];
+      IV1[a+3]=fX[a+3];
+    }
 
+    for(int a=0;a<h;a+=4) {
+      IV2[a]=gY[a];
+      IV2[a+1]=gY[a+1];
+      IV2[a+2]=gY[a+2];
+      IV2[a+3]=gY[a+3];
+    }
 
 
   }
@@ -307,8 +1099,11 @@ void decrypt_ecb(uchar* seq_in, uchar *seq_out, int len, uchar* RM, int *Pbox, i
 
 
 
+
+
+
 template<int h>
-void encrypt_cbc(uchar* seq_in, uchar *seq_out, int len,uchar* RM, int *Pbox, int *PboxSRM, uchar *Sbox1, uchar *Sbox2, uint myrand, int debug) {
+void encrypt_cbc_rm(uchar* seq_in, uchar *seq_out, int len,uchar* RM, int *Pbox, int *PboxSRM, uchar *Sbox1, uchar *Sbox2, uchar *IV, int debug) {
 
   uchar X[h];
   uchar Y[h];
@@ -318,49 +1113,39 @@ void encrypt_cbc(uchar* seq_in, uchar *seq_out, int len,uchar* RM, int *Pbox, in
   uchar IV2[h];
   uchar *RM1;
   uchar *RM2;
+  uchar tmp[h];
 
-  int h2=h*h;
 
 
-
-  
   for(int a=0;a<h;a+=4) {
-    myrand=xorshift32(myrand);
-    uint mm=myrand;
-    IV1[a]=(mm&255);
-    mm>>=8;
-    IV1[a+1]=(mm&255);
-    mm>>=8;
-    IV1[a+2]=(mm&255);
-    mm>>=8;
-    IV1[a+3]=(mm&255);
+    IV1[a]=IV[a];
+    IV1[a+1]=IV[a+1];
+    IV1[a+2]=IV[a+2];
+    IV1[a+3]=IV[a+3];
   }
 
+
   for(int a=0;a<h;a+=4) {
-    myrand=xorshift32(myrand);
-    uint mm=myrand;
-    IV2[a]=(mm&255);
-    mm>>=8;
-    IV2[a+1]=(mm&255);
-    mm>>=8;
-    IV2[a+2]=(mm&255);
-    mm>>=8;
-    IV2[a+3]=(mm&255);
+    IV2[a]=IV[h+a];
+    IV2[a+1]=IV[h+a+1];
+    IV2[a+2]=IV[h+a+2];
+    IV2[a+3]=IV[h+a+3];
 
   }
- 
+
 
   
   for(int it=0;it<len/2;it++) {
     int ind1=Pbox[it]*h;
     int ind2=Pbox[it+len/2]*h;
 
+    RM1=&RM[PboxSRM[it]*h];
+    RM2=&RM[h*h+PboxSRM[len/2-it-1]*h];
 
 
-    RM1=&RM[PboxSRM[it]*h];
-    RM2=&RM[h*h+PboxSRM[it]*h];
 
     
+
     for(int a=0;a<h;a+=4) {
       X[a]=seq_in[ind2+a];
       X[a+1]=seq_in[ind2+a+1];
@@ -376,21 +1161,92 @@ void encrypt_cbc(uchar* seq_in, uchar *seq_out, int len,uchar* RM, int *Pbox, in
     }
 
 
+    for(int a=0;a<h;a+=4) {
+      tmp[a]=X[a]^RM1[a]^IV1[a];
+      tmp[a+1]=X[a+1]^RM1[a+1]^IV1[a+1];
+      tmp[a+2]=X[a+2]^RM1[a+2]^IV1[a+2];
+      tmp[a+3]=X[a+3]^RM1[a+3]^IV1[a+3];
+    }
+
+    for(int a=0;a<h;a+=4) {
+      tmp[a]=Sbox1[tmp[a]];
+      tmp[a+1]=Sbox1[tmp[a+1]];
+      tmp[a+2]=Sbox1[tmp[a+2]];
+      tmp[a+3]=Sbox1[tmp[a+3]];
+    }
+
+    
+    /*for(int a=0;a<h;a+=4) {
+      tmp[a]=Sbox1[X[a]^RM1[a]^IV1[a]];
+      tmp[a+1]=Sbox1[X[a+1]^RM1[a+1]^IV1[a+1]];
+      tmp[a+2]=Sbox1[X[a+2]^RM1[a+2]^IV1[a+2]];
+      tmp[a+3]=Sbox1[X[a+3]^RM1[a+3]^IV1[a+3]];
+      }*/
+
+    for(int a=0;a<h;a+=4) {
+      fX[a]=Sbox2[tmp[a]^Y[a]];
+      fX[a+1]=Sbox2[tmp[a+1]^Y[a+1]];
+      fX[a+2]=Sbox2[tmp[a+2]^Y[a+2]];
+      fX[a+3]=Sbox2[tmp[a+3]^Y[a+3]];
+    }
+
+    /*
     for(int a=0;a<h;a+=4) {
       fX[a]=Sbox2[Sbox1[X[a]^RM1[a]^IV1[a]]^Y[a]];
       fX[a+1]=Sbox2[Sbox1[X[a+1]^RM1[a+1]^IV1[a+1]]^Y[a+1]];
       fX[a+2]=Sbox2[Sbox1[X[a+2]^RM1[a+2]^IV1[a+2]]^Y[a+2]];
       fX[a+3]=Sbox2[Sbox1[X[a+3]^RM1[a+3]^IV1[a+3]]^Y[a+3]];
-    }
+      }*/
+
+
+ for(int a=0;a<h;a+=4) {
+      tmp[a]=fX[a]^Y[a]^IV2[a];
+      tmp[a+1]=fX[a+1]^Y[a+1]^IV2[a+1];
+      tmp[a+2]=fX[a+2]^Y[a+2]^IV2[a+2];
+      tmp[a+3]=fX[a+3]^Y[a+3]^IV2[a+3];
+
+    }     
+
+ for(int a=0;a<h;a+=4) {
+      tmp[a]=Sbox2[tmp[a]];
+      tmp[a+1]=Sbox2[tmp[a+1]];
+      tmp[a+2]=Sbox2[tmp[a+2]];
+      tmp[a+3]=Sbox2[tmp[a+3]];
+
+    }     
+
+ /*
+    for(int a=0;a<h;a+=4) {
+      tmp[a]=Sbox2[fX[a]^Y[a]^IV2[a]];
+      tmp[a+1]=Sbox2[fX[a+1]^Y[a+1]^IV2[a+1]];
+      tmp[a+2]=Sbox2[fX[a+2]^Y[a+2]^IV2[a+2]];
+      tmp[a+3]=Sbox2[fX[a+3]^Y[a+3]^IV2[a+3]];
+
+    }     
+ */
+
+    for(int a=0;a<h;a+=4) {
+      gY[a]=Sbox1[tmp[a]^RM2[a]];
+      gY[a+1]=Sbox1[tmp[a+1]^RM2[a+1]];
+      gY[a+2]=Sbox1[tmp[a+2]^RM2[a+2]];
+      gY[a+3]=Sbox1[tmp[a+3]^RM2[a+3]];
+
+    }     
+
 
+
+    /*
     for(int a=0;a<h;a+=4) {
       gY[a]=Sbox1[Sbox2[fX[a]^Y[a]^IV2[a]]^RM2[a]];
       gY[a+1]=Sbox1[Sbox2[fX[a+1]^Y[a+1]^IV2[a+1]]^RM2[a+1]];
       gY[a+2]=Sbox1[Sbox2[fX[a+2]^Y[a+2]^IV2[a+2]]^RM2[a+2]];
       gY[a+3]=Sbox1[Sbox2[fX[a+3]^Y[a+3]^IV2[a+3]]^RM2[a+3]];
 
-    }     
+    } 
+    */    
 
+
+    
     for(int a=0;a<h;a+=4) {
       seq_out[ind2+a]=gY[a];
       seq_out[ind2+a+1]=gY[a+1];
@@ -404,6 +1260,7 @@ void encrypt_cbc(uchar* seq_in, uchar *seq_out, int len,uchar* RM, int *Pbox, in
       seq_out[ind1+a+2]=fX[a+2];
       seq_out[ind1+a+3]=fX[a+3];
     }
+    
     for(int a=0;a<h;a+=4) {
       IV1[a]=fX[a];
       IV1[a+1]=fX[a+1];
@@ -433,7 +1290,7 @@ void encrypt_cbc(uchar* seq_in, uchar *seq_out, int len,uchar* RM, int *Pbox, in
 
 
 template<int h>
-void decrypt_cbc(uchar* seq_in, uchar *seq_out, int len, uchar* RM, int *Pbox, int *PboxSRM, uchar *Sbox1, uchar *Sbox2, uchar *Inv_Sbox1, uchar *Inv_Sbox2,  uint myrand, int debug) {
+void decrypt_cbc_rm(uchar* seq_in, uchar *seq_out, int len, uchar* RM, int *Pbox, int *PboxSRM, uchar *Sbox1, uchar *Sbox2, uchar *Inv_Sbox1, uchar *Inv_Sbox2,   uchar *IV, int debug) {
 
   uchar invfX[h];
   uchar invgY[h];
@@ -443,36 +1300,24 @@ void decrypt_cbc(uchar* seq_in, uchar *seq_out, int len, uchar* RM, int *Pbox, i
   uchar IV2[h];
   uchar *RM1;
   uchar *RM2;
+  uchar tmp[h];
 
-  for(int a=0;a<h;a+=4) {
-    myrand=xorshift32(myrand);
-    uint mm=myrand;
-    IV1[a]=(mm&255);
-    mm>>=8;
-    IV1[a+1]=(mm&255);
-    mm>>=8;
-    IV1[a+2]=(mm&255);
-    mm>>=8;
-    IV1[a+3]=(mm&255);
-  }
 
   for(int a=0;a<h;a+=4) {
-    myrand=xorshift32(myrand);
-    uint mm=myrand;
-    IV2[a]=(mm&255);
-    mm>>=8;
-    IV2[a+1]=(mm&255);
-    mm>>=8;
-    IV2[a+2]=(mm&255);
-    mm>>=8;
-    IV2[a+3]=(mm&255);
-
+    IV1[a]=IV[a];
+    IV1[a+1]=IV[a+1];
+    IV1[a+2]=IV[a+2];
+    IV1[a+3]=IV[a+3];
   }
 
-  
- 
 
+  for(int a=0;a<h;a+=4) {
+    IV2[a]=IV[h+a];
+    IV2[a+1]=IV[h+a+1];
+    IV2[a+2]=IV[h+a+2];
+    IV2[a+3]=IV[h+a+3];
 
+  }
   
   for(int it=0;it<len/2;it++) {
     int ind1=Pbox[it]*h;
@@ -480,7 +1325,9 @@ void decrypt_cbc(uchar* seq_in, uchar *seq_out, int len, uchar* RM, int *Pbox, i
 
 
     RM1=&RM[PboxSRM[it]*h];
-    RM2=&RM[h*h+PboxSRM[it]*h];
+    RM2=&RM[h*h+PboxSRM[len/2-it-1]*h];
+
+
 
     
     for(int a=0;a<h;a+=4) {
@@ -499,34 +1346,55 @@ void decrypt_cbc(uchar* seq_in, uchar *seq_out, int len, uchar* RM, int *Pbox, i
 
 
     for(int a=0;a<h;a+=4) {
-      invgY[a]=Inv_Sbox1[gY[a]]^RM2[a];
-      invgY[a+1]=Inv_Sbox1[gY[a+1]]^RM2[a+1];
-      invgY[a+2]=Inv_Sbox1[gY[a+2]]^RM2[a+2];
-      invgY[a+3]=Inv_Sbox1[gY[a+3]]^RM2[a+3];
+      tmp[a]=Inv_Sbox1[gY[a]]^RM2[a];
+      tmp[a+1]=Inv_Sbox1[gY[a+1]]^RM2[a+1];
+      tmp[a+2]=Inv_Sbox1[gY[a+2]]^RM2[a+2];
+      tmp[a+3]=Inv_Sbox1[gY[a+3]]^RM2[a+3];
+    }   
+
+
+    for(int a=0;a<h;a+=4) {
+      tmp[a]=Inv_Sbox2[tmp[a]];
+      tmp[a+1]=Inv_Sbox2[tmp[a+1]];
+      tmp[a+2]=Inv_Sbox2[tmp[a+2]];
+      tmp[a+3]=Inv_Sbox2[tmp[a+3]];
     }   
 
 
+    
     for(int a=0;a<h;a+=4) {
-      invgY[a]=Inv_Sbox2[invgY[a]]^fX[a]^IV2[a];
-      invgY[a+1]=Inv_Sbox2[invgY[a+1]]^fX[a+1]^IV2[a+1];
-      invgY[a+2]=Inv_Sbox2[invgY[a+2]]^fX[a+2]^IV2[a+2];
-      invgY[a+3]=Inv_Sbox2[invgY[a+3]]^fX[a+3]^IV2[a+3];
+      invgY[a]=tmp[a]^fX[a]^IV2[a];
+      invgY[a+1]=tmp[a+1]^fX[a+1]^IV2[a+1];
+      invgY[a+2]=tmp[a+2]^fX[a+2]^IV2[a+2];
+      invgY[a+3]=tmp[a+3]^fX[a+3]^IV2[a+3];
     }   
 
 
     for(int a=0;a<h;a+=4) {
-      invfX[a]=Inv_Sbox2[fX[a]]^invgY[a];
-      invfX[a+1]=Inv_Sbox2[fX[a+1]]^invgY[a+1];
-      invfX[a+2]=Inv_Sbox2[fX[a+2]]^invgY[a+2];
-      invfX[a+3]=Inv_Sbox2[fX[a+3]]^invgY[a+3];
+      tmp[a]=Inv_Sbox2[fX[a]]^invgY[a];
+      tmp[a+1]=Inv_Sbox2[fX[a+1]]^invgY[a+1];
+      tmp[a+2]=Inv_Sbox2[fX[a+2]]^invgY[a+2];
+      tmp[a+3]=Inv_Sbox2[fX[a+3]]^invgY[a+3];
+
+    }
+
+
+    for(int a=0;a<h;a+=4) {
+      tmp[a]=Inv_Sbox1[tmp[a]];
+      tmp[a+1]=Inv_Sbox1[tmp[a+1]];
+      tmp[a+2]=Inv_Sbox1[tmp[a+2]];
+      tmp[a+3]=Inv_Sbox1[tmp[a+3]];
 
     }
 
+
+
+
     for(int a=0;a<h;a+=4) {
-      invfX[a]=Inv_Sbox1[invfX[a]]^RM1[a]^IV1[a];
-      invfX[a+1]=Inv_Sbox1[invfX[a+1]]^RM1[a+1]^IV1[a+1];
-      invfX[a+2]=Inv_Sbox1[invfX[a+2]]^RM1[a+2]^IV1[a+2];
-      invfX[a+3]=Inv_Sbox1[invfX[a+3]]^RM1[a+3]^IV1[a+3];
+      invfX[a]=tmp[a]^RM1[a]^IV1[a];
+      invfX[a+1]=tmp[a+1]^RM1[a+1]^IV1[a+1];
+      invfX[a+2]=tmp[a+2]^RM1[a+2]^IV1[a+2];
+      invfX[a+3]=tmp[a+3]^RM1[a+3]^IV1[a+3];
 
     }
 
@@ -567,6 +1435,10 @@ void decrypt_cbc(uchar* seq_in, uchar *seq_out, int len, uchar* RM, int *Pbox, i
 }
 
 
+
+
+
+
 int main(int argc, char** argv) {
 
 
@@ -578,19 +1450,24 @@ int main(int argc, char** argv) {
   
   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],"cbc",3)==0) cbc = atoi(&(argv[i][3]));          //CBC ? 1  otherwise CBC like
+    if(strncmp(argv[i],"cbcrm",5)==0) cbcrm=1;       
+    if(strncmp(argv[i],"cbcprng",7)==0) {cbcprng=1;cbcrm=0;}
+    if(strncmp(argv[i],"ecbrm",5)==0) ecbrm = 1;
+    if(strncmp(argv[i],"ecbprng",7)==0) {ecbprng=1; ecbrm=0;}
     if(strncmp(argv[i],"h",1)==0) h = atoi(&(argv[i][1]));          //size of block
     if(strncmp(argv[i],"sizebuf",7)==0) size_buf = atoi(&(argv[i][7]));          //SIZE of the buffer
     if(strncmp(argv[i],"lena",4)==0) lena = atoi(&(argv[i][4]));          //Use Lena or buffer
   }
 
 /*  printf("nb times %d\n",nb_test);
-  printf("ctr %d\n",ctr);
+  printf("cbcrm %d\n",cbcrm);
+  printf("cbcprng %d\n",cbcprng);
+  printf("ecbrm %d\n",ecbrm);
+  printf("ecbprng %d\n",ecbprng);
   printf("h %d\n",h);
   printf("lena %d\n",lena);
   printf("size_buf %d\n",size_buf);
 */
-  int h2=h*h;
   
 
       
@@ -633,7 +1510,8 @@ int main(int argc, char** argv) {
   }
   else {
     width=height=size_buf;
-    imsize=width*height;
+    imsize=width*height*3;
+    //cout<<"imsize "<<imsize<<endl;
     buffer=new uchar[imsize];
     for(int i=0;i<imsize;i++) {
       buffer[i]=lrand48();
@@ -642,7 +1520,7 @@ int main(int argc, char** argv) {
 
 
 
-  
+  cout<<"imsize "<<imsize<<endl;
   
   uchar* seq= new uchar[imsize];
   uchar* seq2= new uchar[imsize];
@@ -663,7 +1541,7 @@ int main(int argc, char** argv) {
 
 
 
-  
+
 
   int total_len=imsize;
   int rp=1;
@@ -709,38 +1587,41 @@ int main(int argc, char** argv) {
   uchar Inv_Sbox1[256];
   uchar Inv_Sbox2[256];
   uchar sc[256];  
-  uchar RM[h2*2];
-
-
-  uint myrand=0;
+  uchar RM[h*h*2+256];
+  uchar IV[2*h];
 
+  mylong myrand=0;
+ 
 
   double time_encrypt=0;
   double time_decrypt=0;
   
 
   double t=TimeStart();  
-  rc4key(DK, Sbox1, 8);
-  
-  
-  rc4key(&DK[8], Sbox2, 8);
-  
-  rc4key(&DK[16], sc, 16);
-  prga(sc, h2*2, RM);
-
 
+  for(int i=0;i<nb_test;i++) {
 
-
-  
-  rc4keyperm(&DK[72], len, rp, Pbox, 16);
+    rc4key(DK, Sbox1, 8);
   
   
-  rc4keyperm(&DK[88], len/2, rp, PboxSRM2, 16);
+    rc4key(&DK[8], Sbox2, 8);
+    
+    rc4key(&DK[16], sc, 16);
+    prga(sc, h*h*2+256, RM);
+    
+
 
-  for(int i=0;i<len/2;i++) {
-    PboxSRM[i]=PboxSRM2[i]&(h-1);
-  }
 
+  
+    rc4keyperm(&DK[72], len, rp, Pbox, 16);
+    
+    
+    rc4keyperm(&DK[88], len/2, rp, PboxSRM2, 16);
+    
+    for(int i=0;i<len/2;i++) {
+      PboxSRM[i]=PboxSRM2[i]&(h-1);
+    }
+    
 /*
   for(int i=0;i<h*2;i++) {
     for(int j=0;j<h;j++)
@@ -748,20 +1629,19 @@ int main(int argc, char** argv) {
     cout<<endl;
   }
 */
+  }
 
-
-  
-  //time+=TimeStop(t);
-  //cout<<"Time initializaton "<<time<<endl;
+  double time_init=0;
+  time_init+=TimeStop(t);
+  cout<<"Time initializaton nb times "<<nb_test<<"   = "<<time_init<<endl;
 
 
 
   myrand=0;
-  for(int i=0;i<32;i++) {
+  for(int i=0;i<64;i++) {
     myrand|=DK[i]&1;
     myrand<<=1;
   }
-  uint myrand_copy=myrand;
 
  
 
@@ -773,8 +1653,8 @@ int main(int argc, char** argv) {
   inverse_tables(Sbox2,256,Inv_Sbox2);
 
 
-
-  
+  xorseed=myrand;
+//  lehmer64_seed(myrand);
   time_encrypt=0;
   t=TimeStart();
 
@@ -783,62 +1663,103 @@ int main(int argc, char** argv) {
   case 4: 
     for(i=0;i<nb_test;i++)
     {
-      if(cbc)
-	encrypt_cbc<4>(seq, seq2,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,myrand,0);
-      else
-	encrypt_ecb<4>(seq, seq2,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,myrand,0);
+      if(cbcprng)
+	encrypt_cbc_prng<4>(seq, seq2,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,IV,myrand,0);
+      if(cbcrm)
+	encrypt_cbc_rm<4>(seq, seq2,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,IV,0);
+      if(ecbrm)
+	encrypt_ecb_rm<4>(seq, seq2,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,IV,0);
+      if(ecbprng)
+	encrypt_ecb_prng<4>(seq, seq2,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,IV,myrand,0);
     }
     break;
   case 8: 
     for(i=0;i<nb_test;i++)
     {
-      if(cbc)
-	encrypt_cbc<8>(seq, seq2,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,myrand,0);
-      else
-	encrypt_ecb<8>(seq, seq2,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,myrand,0);
+      if(cbcprng)
+	encrypt_cbc_prng<8>(seq, seq2,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,IV,myrand,0);
+      if(cbcrm)
+	encrypt_cbc_rm<8>(seq, seq2,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,IV,0);
+      if(ecbrm)
+	encrypt_ecb_rm<8>(seq, seq2,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,IV,0);
+      if(ecbprng)
+	encrypt_ecb_prng<8>(seq, seq2,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,IV,myrand,0);
     }
     break;
   case 16: 
     for(i=0;i<nb_test;i++)
     {
-      if(cbc)
-	encrypt_cbc<16>(seq, seq2,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,myrand,0);
-      else
-	encrypt_ecb<16>(seq, seq2,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,myrand,0);
+      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;
   case 32: 
     for(i=0;i<nb_test;i++)
     {
-      if(cbc)
-	encrypt_cbc<32>(seq, seq2,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,myrand,0);
-      else
-	encrypt_ecb<32>(seq, seq2,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,myrand,0);
+      if(cbcprng)
+	encrypt_cbc_prng<32>(seq, seq2,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,IV,myrand,0);
+      if(cbcrm)
+	encrypt_cbc_rm<32>(seq, seq2,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,IV,0);
+      if(ecbrm)
+	encrypt_ecb_rm<32>(seq, seq2,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,IV,0);
+      if(ecbprng)
+	encrypt_ecb_prng<32>(seq, seq2,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,IV,myrand,0);
     }
     break;
   case 64: 
     for(i=0;i<nb_test;i++)
     {
-      if(cbc)
-	encrypt_cbc<64>(seq, seq2,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,myrand,0);
-      else
-	encrypt_ecb<64>(seq, seq2,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,myrand,0);
+      if(cbcprng)
+	encrypt_cbc_prng<64>(seq, seq2,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,IV,myrand,0);
+      if(cbcrm)
+	encrypt_cbc_rm<64>(seq, seq2,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,IV,0);
+      if(ecbrm)
+	encrypt_ecb_rm<64>(seq, seq2,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,IV,0);
+      if(ecbprng)
+	encrypt_ecb_prng<64>(seq, seq2,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,IV,myrand,0);
       
     }
     break;
   case 128: 
     for(i=0;i<nb_test;i++)
     {
-      if(cbc)
-	encrypt_cbc<128>(seq, seq2,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,myrand,0);
-      else
-	encrypt_ecb<128>(seq, seq2,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,myrand,0);
+      if(cbcprng)
+	encrypt_cbc_prng<128>(seq, seq2,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,IV,myrand,0);
+      if(cbcrm)
+	encrypt_cbc_rm<128>(seq, seq2,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,IV,0);
+      if(ecbrm)
+	encrypt_ecb_rm<128>(seq, seq2,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,IV,0);
+      if(ecbprng)
+	encrypt_ecb_prng<128>(seq, seq2,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,IV,myrand,0);
+      
+    }
+    break;
+  case 256:
+
+    for(i=0;i<nb_test;i++)
+    {
+      if(cbcprng)
+	encrypt_cbc_prng<256>(seq, seq2,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,IV,myrand,0);
+      if(cbcrm)
+	encrypt_cbc_rm<256>(seq, seq2,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,IV,0);
+      if(ecbrm)
+	encrypt_ecb_rm<256>(seq, seq2,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,IV,0);
+      if(ecbprng)
+	encrypt_ecb_prng<256>(seq, seq2,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,IV,myrand,0);
       
     }
     break;
   }
+
+
   time_encrypt+=TimeStop(t);
-  //cout<<"Time encrypt "<<
+  cout<<"Time encrypt "<<time_encrypt<<endl;
   cout<<(double)imsize*nb_test/time_encrypt<<"\t";
 
 
@@ -851,63 +1772,102 @@ int main(int argc, char** argv) {
     store_RGB_pixmap("lena2.ppm", data_R, data_G, data_B, width, height);
   }
 
-  
 
+  xorseed=myrand;
+  // lehmer64_seed(myrand);
   time_decrypt=0;
   t=TimeStart();
   switch(h) {
   case 4:
     for(i=0;i<nb_test;i++) {
-      if(cbc)
-	decrypt_cbc<4>(seq2,seq,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,Inv_Sbox1,Inv_Sbox2,myrand,0);
-      else
-	decrypt_ecb<4>(seq2,seq,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,Inv_Sbox1,Inv_Sbox2,myrand,0);
+      if(cbcprng)
+	decrypt_cbc_prng<4>(seq2,seq,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,Inv_Sbox1,Inv_Sbox2,IV,myrand,0);
+      if(cbcrm)
+	decrypt_cbc_rm<4>(seq2,seq,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,Inv_Sbox1,Inv_Sbox2,IV,0);
+      if(ecbrm)
+	decrypt_ecb_rm<4>(seq2,seq,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,Inv_Sbox1,Inv_Sbox2,IV,0);
+      if(ecbprng)
+	decrypt_ecb_prng<4>(seq2,seq,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,Inv_Sbox1,Inv_Sbox2,IV,myrand,0);
     }
     break;
   case 8:
     for(i=0;i<nb_test;i++) {
-      if(cbc)
-	decrypt_cbc<8>(seq2,seq,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,Inv_Sbox1,Inv_Sbox2,myrand,0);
-      else
-	decrypt_ecb<8>(seq2,seq,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,Inv_Sbox1,Inv_Sbox2,myrand,0);
+      if(cbcprng)
+	decrypt_cbc_prng<8>(seq2,seq,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,Inv_Sbox1,Inv_Sbox2,IV,myrand,0);
+      if(cbcrm)
+	decrypt_cbc_rm<8>(seq2,seq,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,Inv_Sbox1,Inv_Sbox2,IV,0);
+      if(ecbrm)
+	decrypt_ecb_rm<8>(seq2,seq,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,Inv_Sbox1,Inv_Sbox2,IV,0);
+      if(ecbprng)
+	decrypt_ecb_prng<8>(seq2,seq,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,Inv_Sbox1,Inv_Sbox2,IV,myrand,0);
     }
     break;
   case 16:
     for(i=0;i<nb_test;i++) {
-      if(cbc)
-	decrypt_cbc<16>(seq2,seq,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,Inv_Sbox1,Inv_Sbox2,myrand,0);
-      else
-	decrypt_ecb<16>(seq2,seq,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,Inv_Sbox1,Inv_Sbox2,myrand,0);
+      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;
   case 32:
     for(i=0;i<nb_test;i++) {
-      if(cbc)
-	decrypt_cbc<32>(seq2,seq,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,Inv_Sbox1,Inv_Sbox2,myrand,0);
-      else
-	decrypt_ecb<32>(seq2,seq,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,Inv_Sbox1,Inv_Sbox2,myrand,0);
+      if(cbcprng)
+	decrypt_cbc_prng<32>(seq2,seq,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,Inv_Sbox1,Inv_Sbox2,IV,myrand,0);
+      if(cbcrm)
+	decrypt_cbc_rm<32>(seq2,seq,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,Inv_Sbox1,Inv_Sbox2,IV,0);
+      if(ecbrm)
+	decrypt_ecb_rm<32>(seq2,seq,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,Inv_Sbox1,Inv_Sbox2,IV,0);
+      if(ecbprng)
+	decrypt_ecb_prng<32>(seq2,seq,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,Inv_Sbox1,Inv_Sbox2,IV,myrand,0);
     }
     break;
   case 64:
     for(i=0;i<nb_test;i++) {
-      if(cbc)
-	decrypt_cbc<64>(seq2,seq,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,Inv_Sbox1,Inv_Sbox2,myrand,0);
-      else
-	decrypt_ecb<64>(seq2,seq,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,Inv_Sbox1,Inv_Sbox2,myrand,0);
+      if(cbcprng)
+	decrypt_cbc_prng<64>(seq2,seq,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,Inv_Sbox1,Inv_Sbox2,IV,myrand,0);
+      if(cbcrm)
+	decrypt_cbc_rm<64>(seq2,seq,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,Inv_Sbox1,Inv_Sbox2,IV,0);
+      if(ecbrm)
+	decrypt_ecb_rm<64>(seq2,seq,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,Inv_Sbox1,Inv_Sbox2,IV,0);
+      if(ecbprng)
+	decrypt_ecb_prng<64>(seq2,seq,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,Inv_Sbox1,Inv_Sbox2,IV,myrand,0);
     }
     break;
   case 128:
     for(i=0;i<nb_test;i++) {
-      if(cbc)
-	decrypt_cbc<128>(seq2,seq,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,Inv_Sbox1,Inv_Sbox2,myrand,0);
-      else
-	decrypt_ecb<128>(seq2,seq,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,Inv_Sbox1,Inv_Sbox2,myrand,0);
+      if(cbcprng)
+	decrypt_cbc_prng<128>(seq2,seq,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,Inv_Sbox1,Inv_Sbox2,IV,myrand,0);
+      if(cbcrm)
+	decrypt_cbc_rm<128>(seq2,seq,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,Inv_Sbox1,Inv_Sbox2,IV,0);
+      if(ecbrm)
+	decrypt_ecb_rm<128>(seq2,seq,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,Inv_Sbox1,Inv_Sbox2,IV,0);
+      if(ecbprng)
+	decrypt_ecb_prng<128>(seq2,seq,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,Inv_Sbox1,Inv_Sbox2,IV,myrand,0);
+    }
+    break;
+  case 256:
+    for(i=0;i<nb_test;i++) {
+      if(cbcprng)
+	decrypt_cbc_prng<256>(seq2,seq,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,Inv_Sbox1,Inv_Sbox2,IV,myrand,0);
+      if(cbcrm)
+	decrypt_cbc_rm<256>(seq2,seq,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,Inv_Sbox1,Inv_Sbox2,IV,0);
+      if(ecbrm)
+	decrypt_ecb_rm<256>(seq2,seq,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,Inv_Sbox1,Inv_Sbox2,IV,0);
+      if(ecbprng)
+	decrypt_ecb_prng<256>(seq2,seq,len,RM,Pbox,PboxSRM,Sbox1,Sbox2,Inv_Sbox1,Inv_Sbox2,IV,myrand,0);
     }
     break;
   }
 
+
+  
   time_decrypt+=TimeStop(t);
-  //cout<<"Time decrypt "
+//  cout<<"Time decrypt "<<time_decrypt<<endl;
   cout<<(double)imsize*nb_test/time_decrypt<<"\t";
 
   if(lena) {
@@ -926,10 +1886,9 @@ int main(int argc, char** argv) {
 	equal=false;
       }
     }
-//    cout<<"RESULT CORRECT: "<<equal<<endl;
+    //cout<<"RESULT CORRECT: "<<equal<<endl;
   }
   
 
-
   return 0;
 }