From: Raphaël Couturier <raphael.couturier@univ-fcomte.fr>
Date: Fri, 28 Aug 2020 05:16:39 +0000 (+0200)
Subject: new
X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/Cipher_code.git/commitdiff_plain/149268e31dcc62cf18eddd1b8ffa37cf81acbbca?ds=inline;hp=43dcec640e3ca462625fe259f0b2bb5660ac8131

new
---

diff --git a/OneRoundIoT/OneRound/Makefile b/OneRoundIoT/OneRound/Makefile
index 250dc55..38b4eab 100644
--- a/OneRoundIoT/OneRound/Makefile
+++ b/OneRoundIoT/OneRound/Makefile
@@ -23,6 +23,10 @@ one_round_new.o: one_round_new.cpp
 one_round_new3.o: one_round_new3.cpp 
 	$(CXX) -c -o $@ $< $(CFLAGS)
 
+one_round_new4.o: one_round_new4.cpp 
+	$(CXX) -c -o $@ $< $(CFLAGS)
+
+
 one_round_steph.o: one_round_steph.cpp 
 	$(CXX) -c -o $@ $< $(CFLAGS)
 
@@ -52,6 +56,9 @@ one_round_new: pixmap_io.o one_round_new.o
 one_round_new3: pixmap_io.o one_round_new3.o 
 	$(CXX)  -o $@ $^ $(CFLAGS)
 
+one_round_new4: pixmap_io.o one_round_new4.o 
+	$(CXX)  -o $@ $^ $(CFLAGS)
+
 one_round_steph: pixmap_io.o one_round_steph.o 
 	$(CXX)  -o $@ $^ $(CFLAGS)
 
@@ -85,4 +92,4 @@ one_round_auth: pixmap_io.o one_round_auth.o
 	$(CXX)  -o $@ $^ $(CFLAGS)
 
 clean:
-	rm -rf *.o one_round_new one_round_hash one_round_par2 one_round_hash_new  rc4_hash rc4_hash2  rc4_hash3 one_round_steph
+	rm -rf *.o one_round_new one_round_new4 one_round_hash one_round_par2 one_round_hash_new  rc4_hash rc4_hash2  rc4_hash3 one_round_steph
diff --git a/OneRoundIoT/OneRound/one_round_hash_new3.cpp b/OneRoundIoT/OneRound/one_round_hash_new3.cpp
index db0ea08..5e9bf8a 100644
--- a/OneRoundIoT/OneRound/one_round_hash_new3.cpp
+++ b/OneRoundIoT/OneRound/one_round_hash_new3.cpp
@@ -172,22 +172,6 @@ void hash_DSD_BIN(uchar* seq_in, uchar* RM1,int len, int *Pbox,int *PboxRM, ucha
     }
     
     
-    /*  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];
-      RM1[a+3]=RM1[a+3]^seq_in[ind1+a+3];
-    }
-
-  for(int a=0;a<h;a+=4) {
-      RM1[a]=Sbox1[RM1[a]]^seq_in[ind2+a];
-      RM1[a+1]=Sbox1[RM1[a+1]]^seq_in[ind2+a+1];
-      RM1[a+2]=Sbox1[RM1[a+2]]^seq_in[ind2+a+2];
-      RM1[a+3]=Sbox1[RM1[a+3]]^seq_in[ind2+a+3];
-    }
-    */
-
-    
 
      for(int a=0;a<h;a+=4) {
        RM1[a]=Sbox2[RM1[a]];
diff --git a/OneRoundIoT/OneRound/one_round_new4.cpp b/OneRoundIoT/OneRound/one_round_new4.cpp
new file mode 100644
index 0000000..414c03c
--- /dev/null
+++ b/OneRoundIoT/OneRound/one_round_new4.cpp
@@ -0,0 +1,796 @@
+//gcc pixmap_io.c  -c 
+//g++ -O3 one_round_new.cpp pixmap_io.o  -o one_round_new -std=c++11   
+
+#include <iostream>
+#include <list>
+#include<math.h>
+#include<stdlib.h>
+#include<stdio.h>
+#include<string.h>
+#include <fstream>
+#include <sys/time.h>
+#include <glib.h>
+
+
+/*#include <cryptopp/hex.h>
+#include <cryptopp/sha.h>
+#include <cryptopp/osrng.h>
+#include <cryptopp/secblock.h>
+*/
+
+
+extern "C" {
+  int load_RGB_pixmap(char *filename, int *width, int *height, unsigned char**R_data, unsigned char**G_data, unsigned char**B_data);
+  void store_RGB_pixmap(char *filename, unsigned char *R_data, unsigned char *G_data, unsigned char *B_data, int width, int height);
+}
+
+
+//using namespace CryptoPP;
+using namespace std;
+
+
+int key_size=256;
+int nb_test=1;
+int ctr=0;
+
+
+
+
+
+
+
+typedef unsigned char   uchar;
+
+
+double TimeStart()
+{
+  struct timeval tstart;
+  gettimeofday(&tstart,0);
+  return( (double) (tstart.tv_sec + tstart.tv_usec*1e-6) );
+}
+
+double TimeStop(double t)
+{
+  struct timeval tend;
+
+  gettimeofday(&tend,0);
+  t = (double) (tend.tv_sec + tend.tv_usec*1e-6) - t;
+  return (t);
+}
+
+
+
+
+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;
+}
+
+uint64_t xorshift64( const uint64_t state)
+{
+  uint64_t x = state;
+  x^= x << 13;
+  x^= x >> 7;
+  x^= x << 17;
+  return x;
+}
+
+
+
+
+void inverse_tables(uchar *tab, int size_tab,uchar *inv_perm_tabs) {
+
+  for(int i=0;i<size_tab;i++) {
+    inv_perm_tabs[tab[i]] = i;
+  }
+
+}
+
+void inverse_tables_int(int *tab, int size_tab,int *inv_perm_tabs) {
+
+  for(int i=0;i<size_tab;i++) {
+    inv_perm_tabs[tab[i]] = i;
+  }
+
+}
+
+
+
+void rc4key(uchar *key, uchar *sc, int size_DK) {
+
+  for(int i=0;i<256;i++) {
+    sc[i]=i;
+  }
+
+
+  uchar j0 = 0;
+  for(int i0=0; i0<256; i0++) {
+    j0 = (j0 + sc[i0] + key[i0%size_DK] )&0xFF;
+    uchar tmp = sc[i0];
+    sc[i0] = sc[j0 ];
+    sc[j0] = tmp;
+  }
+}
+
+
+
+void rc4keyperm(uchar *key,int len, int rp,int *sc, int size_DK) {
+
+  //sc=1:len;
+
+
+  
+  for (int i=0;i<len;i++) {
+    sc[i]=i;
+  }
+  for (int it = 0; it < rp; it++) {
+    int j0 = 1;
+    for(int i0 = 0; i0<len; i0++) {
+      j0 = (j0 + sc[i0] + sc[j0] + key[i0%size_DK] )% len;
+      int tmp = sc[i0];
+      sc[i0] = sc[j0];
+      sc[j0] = tmp;
+    }
+
+  }
+}
+
+void prga(uchar *sc, int ldata, uchar *r) {
+  uchar i0=0;
+  uchar j0=0;
+
+  for (int it=0; it<ldata; it++) {
+    i0 = ((i0+1)%255);
+    j0 = (j0 + sc[i0])&0xFF;
+    uchar tmp = sc[i0];
+    sc[i0] = sc[j0];
+    sc[j0] = tmp;
+    r[it]=sc[(sc[i0]+sc[j0])&0xFF];
+  }
+}
+
+
+
+
+
+template<int h2>
+void encrypt_ctr(uchar* seq_in, uchar *seq_out, int len,uchar* RM1,int *Pbox, int *PboxRM, uchar *Sbox1, uchar *Sbox2, uint64_t myrand,int enc) {
+
+  
+  uchar X[h2];
+  uchar fX[h2];
+
+  int ind1,ind2;
+
+  
+  for(int a=0;a<h2/8;a+=2) {
+
+    myrand=xorshift64(myrand);
+    ((unsigned long*)X)[a]=myrand;
+    myrand=xorshift64(myrand);
+    ((unsigned long*)X)[a+1]=myrand;
+  }
+
+  for(int a=0;a<h2;a+=4) {
+    X[a]=Sbox2[X[a]];
+    X[a+1]=Sbox1[X[a+1]];
+    X[a+2]=Sbox2[X[a+2]];
+    X[a+3]=Sbox1[X[a+3]];
+  }
+
+
+  for(int it=0;it<len;it++) {
+    if(enc) {
+      ind1=it*h2;
+      ind2=Pbox[it]*h2;
+    }
+    else {
+      ind2=it*h2;
+      ind1=Pbox[it]*h2;
+    }
+    ind1/=8;
+    ind2/=8;
+    
+
+    for(int a=0;a<h2/8;a+=2) {
+      myrand=xorshift64(myrand);
+      ((unsigned long*)X)[a]=((unsigned long *)X)[a]^myrand;
+      myrand=xorshift64(myrand);
+      ((unsigned long*)X)[a+1]=((unsigned long *)X)[a+1]^myrand;
+    }
+
+
+    
+    for(int a=0;a<h2;a+=4) {
+      X[a]=Sbox1[X[a]];
+      X[a+1]=Sbox2[X[a+1]];
+      X[a+2]=Sbox1[X[a+2]];
+      X[a+3]=Sbox2[X[a+3]];
+    }
+
+    for(int a=0;a<h2/8;a+=2) {
+      ((unsigned long*)X)[a]=((unsigned long*)X)[a]^((unsigned long*)RM1)[a];
+      ((unsigned long*)X)[a+1]=((unsigned long*)X)[a+1]^((unsigned long*)RM1)[a+1];
+    }
+
+
+    for(int a=0;a<h2/8;a+=2) {
+      ((unsigned long*)X)[a]=((unsigned long*)X)[a]^((unsigned long*)RM1)[a];
+      ((unsigned long*)X)[a+1]=((unsigned long*)X)[a+1]^((unsigned long*)RM1)[a+1];
+    }
+
+
+
+
+    for(int a=0;a<h2/8;a+=2) {
+
+
+      ((unsigned long*)seq_out)[ind1+a]=((unsigned long*)X)[a]^((unsigned long*)seq_in)[ind2+a];
+      ((unsigned long*)seq_out)[ind1+a+1]=((unsigned long*)X)[a+1]^((unsigned long*)seq_in)[ind2+a+1];
+
+
+    }
+
+    for(int a=0;a<h2/8;a+=2) {
+      ((unsigned long*)RM1)[a]=xorshift64(((unsigned long*)RM1)[a]);
+      ((unsigned long*)RM1)[a+1]=xorshift64(((unsigned long*)RM1)[a+1]);
+    }
+
+    /*  
+    for(int a=0;a<h2;a+=4) {
+      RM1[a]=Sbox1[RM1[a]];
+      RM1[a+1]=Sbox2[RM1[a+1]];
+      RM1[a+2]=Sbox1[RM1[a+2]];
+      RM1[a+3]=Sbox2[RM1[a+3]];
+    }
+    */
+    
+  }
+
+
+}
+
+
+
+
+template<int h2>
+void encrypt(uchar* seq_in, uchar *seq_out, int len,uchar* RM1, int *Pbox, int *PboxRM, uchar *Sbox1, uchar *Sbox2, uint64_t myrand, int debug) {
+
+  uchar X[h2];
+
+
+  for(int it=0;it<len;it++) {
+    int ind1=it*h2;
+    int ind2=Pbox[it]*h2;
+    ind1/=8;
+    ind2/=8;
+    
+    for(int a=0;a<h2/8;a+=2) {
+      myrand=xorshift64(myrand);
+      ((unsigned long*)X)[a]=((unsigned long*)seq_in)[ind2+a]^myrand;
+      myrand=xorshift64(myrand);
+      ((unsigned long*)X)[a+1]=((unsigned long*)seq_in)[ind2+a+1]^myrand;
+    }
+    
+
+    for(int a=0;a<h2;a+=4){
+      X[a]=Sbox1[X[a]];
+      X[a+1]=Sbox2[X[a+1]];
+      X[a+2]=Sbox1[X[a+2]];
+      X[a+3]=Sbox2[X[a+3]];
+    }
+
+
+    /*    for(int a=0;a<h2;a+=4) {
+      X[a]=X[a]^RM1[a];
+      X[a+1]=X[a+1]^RM1[a+1];
+      X[a+2]=X[a+2]^RM1[a+2];
+      X[a+3]=X[a+3]^RM1[a+3];
+      }*/
+
+
+    /*for(int a=0;a<h2;a+=4) {
+      seq_out[ind1+a]=Sbox2[fX[a]];
+      seq_out[ind1+a+1]=Sbox1[fX[a+1]];
+      seq_out[ind1+a+2]=Sbox2[fX[a+2]];
+      seq_out[ind1+a+3]=Sbox1[fX[a+3]];
+      }*/
+    
+    for(int a=0;a<h2/8;a+=2) {
+      ((unsigned long*)seq_out)[ind1+a]=((unsigned long*)X)[a]^((unsigned long*)RM1)[a];
+      ((unsigned long*)seq_out)[ind1+a+1]=((unsigned long*)X)[a+1]^((unsigned long*)RM1)[a+1];
+    }
+
+    
+    /*   for(int a=0;a<h2;a+=4) {
+      RM1[a]=Sbox1[RM1[PboxRM[a]]];
+      RM1[a+1]=Sbox2[RM1[PboxRM[a+1]]];
+      RM1[a+2]=Sbox1[RM1[PboxRM[a+2]]];
+      RM1[a+3]=Sbox2[RM1[PboxRM[a+3]]];
+
+      }*/
+
+    for(int a=0;a<h2/8;a+=2) {
+      ((unsigned long*)RM1)[a]=xorshift64(((unsigned long*)RM1)[a]);
+      ((unsigned long*)RM1)[a+1]=xorshift64(((unsigned long*)RM1)[a+1]);
+    }
+    
+
+  }
+
+
+  
+
+
+
+}
+
+
+
+
+
+
+
+
+template<int h2>
+void decrypt(uchar* seq_in, uchar *seq_out, int len, uchar* RM1, int *Pbox, int *PboxRM, uchar *Sbox1, uchar *Sbox2, uchar *Inv_Sbox1, uchar *Inv_Sbox2,  uint64_t myrand, int debug) {
+
+
+
+ uchar X[h2];
+
+
+
+  for(int it=0;it<len;it++) {
+
+    int ind1=it*h2;
+    int ind2=Pbox[it]*h2;
+    ind1/=8;
+    ind2/=8;
+
+
+    /*
+    for(int a=0;a<h2;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<h2/8;a+=2) {
+      ((unsigned long*)X)[a]=((unsigned long*)seq_in)[ind1+a]^((unsigned long*)RM1)[a];
+      ((unsigned long*)X)[a+1]=((unsigned long*)seq_in)[ind1+a+1]^((unsigned long*)RM1)[a+1];
+    }
+
+    /*    for(int a=0;a<h2;a+=4) {
+      fX[a]=Inv_Sbox2[fX[a]];
+      fX[a+1]=Inv_Sbox1[fX[a+1]];
+      fX[a+2]=Inv_Sbox2[fX[a+2]];
+      fX[a+3]=Inv_Sbox1[fX[a+3]];
+    }
+    */
+    /* for(int a=0;a<h2;a+=4) {
+      X[a]=X[a]^RM1[a];
+      X[a+1]=X[a+1]^RM1[a+1];
+      X[a+2]=X[a+2]^RM1[a+2];
+      X[a+3]=X[a+3]^RM1[a+3];
+      }*/
+
+
+    /*    for(int a=0;a<h2;a+=4) {
+      RM1[a]=Sbox1[RM1[PboxRM[a]]];
+      RM1[a+1]=Sbox2[RM1[PboxRM[a+1]]];
+      RM1[a+2]=Sbox1[RM1[PboxRM[a+2]]];
+      RM1[a+3]=Sbox2[RM1[PboxRM[a+3]]];
+      }*/
+
+    for(int a=0;a<h2/8;a+=2) {
+      ((unsigned long*)RM1)[a]=xorshift64(((unsigned long*)RM1)[a]);
+      ((unsigned long*)RM1)[a+1]=xorshift64(((unsigned long*)RM1)[a+1]);
+    }
+    
+
+     for(int a=0;a<h2;a+=4) {
+       X[a]=Inv_Sbox1[X[a]];
+       X[a+1]=Inv_Sbox2[X[a+1]];
+       X[a+2]=Inv_Sbox1[X[a+2]];
+       X[a+3]=Inv_Sbox2[X[a+3]];
+    }
+    
+
+    /*    for(int a=0;a<h2;a+=4) {
+      myrand=xorshift32(myrand);
+
+      uint mm=myrand;
+      seq_out[ind2+a]=Inv_Sbox1[fX[a]]^(mm&255);
+      mm>>=8;
+      seq_out[ind2+a+1]=Inv_Sbox2[fX[a+1]]^(mm&255);
+      mm>>=8;
+      seq_out[ind2+a+2]=Inv_Sbox1[fX[a+2]]^(mm&255);
+      mm>>=8;
+      seq_out[ind2+a+3]=Inv_Sbox2[fX[a+3]]^(mm&255);
+    }
+    */
+
+      for(int a=0;a<h2/8;a+=2) {
+      myrand=xorshift64(myrand);
+      ((unsigned long*)seq_out)[ind2+a]=((unsigned long*)X)[a]^myrand;
+      myrand=xorshift64(myrand);
+      ((unsigned long*)seq_out)[ind2+a+1]=((unsigned long*)X)[a+1]^myrand;
+    }
+
+     
+
+  }
+
+
+
+}
+
+
+int main(int argc, char** argv) {
+
+
+  int h=32;
+  int lena=0;
+  int size_buf=1;
+
+
+  
+  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],"ctr",3)==0) ctr = atoi(&(argv[i][3]));          //CTR ? 1  otherwise CBC like
+    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("h %d\n",h);
+  printf("lena %d\n",lena);
+  printf("size_buf %d\n",size_buf);
+*/
+  int h2=h*h;
+  
+
+      
+  int seed=time(NULL);
+//  cout<<seed<<endl;
+  srand48(seed);
+
+  uchar Secretkey[key_size];
+
+  uchar counter[key_size];
+
+  for(int i=0;i<key_size;i++) {
+    Secretkey[i]=lrand48()&0xFF;
+    counter[i]=lrand48()&0xFF;
+  }
+
+  
+  int size = 64;
+  uchar DK[size];
+
+
+
+
+  int width;
+  int height;
+
+  uchar *data_R, *data_G, *data_B;
+  int imsize;
+  uchar *buffer;
+
+
+
+
+  
+  if(lena==1) {
+    load_RGB_pixmap("lena.ppm", &width, &height, &data_R, &data_G, &data_B);
+//    load_RGB_pixmap("8192.ppm", &width, &height, &data_R, &data_G, &data_B);
+    imsize=width*height*3;
+//  load_RGB_pixmap("No_ecb_mode_picture.ppm", &width, &height, &data_R, &data_G, &data_B);
+  }
+  else {
+    width=height=size_buf;
+    imsize=width*height;
+    buffer=new uchar[imsize];
+    for(int i=0;i<imsize;i++) {
+      buffer[i]=lrand48();
+    }
+  }
+
+
+
+  
+  
+  uchar* seq= new uchar[imsize];
+  uchar* seq2= new uchar[imsize];
+
+  int oneD=width*height;
+  if(lena) {
+    for(int i=0;i<oneD;i++) {
+      seq[i]=data_R[i];
+      seq[oneD+i]=data_G[i];
+      seq[2*oneD+i]=data_B[i];
+    }
+  }
+  else {
+    for(int i=0;i<oneD;i++) {
+      seq[i]=buffer[i];
+    }
+  }
+
+
+
+  
+
+  int total_len=imsize;
+  int rp=1;
+  int len= total_len/h2;
+
+
+  
+  uchar *mix=new uchar[256];
+
+
+
+    
+  for (int i = 0; i < 256 ; i++) {
+    mix[i]=Secretkey[i]^counter[i];
+    
+  }
+  gchar  *sha512;
+
+  sha512 = g_compute_checksum_for_string(G_CHECKSUM_SHA512, (const char*) mix, 256);
+//  g_print("%s\n", sha512);
+ 
+
+
+
+
+
+
+
+  
+//  cout<<"hash "<<endl;
+  for (int i = 0; i < 64 ; i++) {
+//    DK[i]=digest[i];
+    DK[i]=sha512[i];
+  }
+  g_free(sha512);
+
+
+  int *Pbox=new int[len];
+  int *PboxRM=new int[h2];
+  uchar Sbox1[256];
+  uchar Sbox2[256];  
+  uchar Inv_Sbox1[256];
+  uchar Inv_Sbox2[256];
+  uchar sc[256];  
+  uchar RM1[h2];
+  uchar RM1_copy[h2];
+  uchar RMtmp[h2];
+
+
+  uint64_t 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, RM1);
+  
+  
+  rc4keyperm(&DK[32], len, rp, Pbox, 16);
+  
+  
+  rc4keyperm(&DK[48], h2, rp, PboxRM, 16);
+  
+  //time+=TimeStop(t);
+  //cout<<"Time initializaton "<<time<<endl;
+
+
+
+  myrand=0;
+  for(int i=0;i<64;i++) {
+    myrand|=DK[i]&1;
+    myrand<<=1;
+  }
+  uint64_t myrand_copy=myrand;
+
+ 
+
+
+
+  
+  for(int i=0;i<h2;i++){
+    RM1_copy[i]=RM1[i];
+  }
+
+  
+  inverse_tables(Sbox1,256,Inv_Sbox1);
+  inverse_tables(Sbox2,256,Inv_Sbox2);
+
+
+
+
+  
+  time_encrypt=0;
+  t=TimeStart();
+
+  int i;
+  switch(h) {
+  case 4: 
+    for(i=0;i<nb_test;i++)
+    {
+      if(ctr)
+	encrypt_ctr<4*4>(seq, seq2,len,RM1,Pbox,PboxRM,Sbox1,Sbox2,myrand,1);
+      else
+	encrypt<4*4>(seq, seq2,len,RM1,Pbox,PboxRM,Sbox1,Sbox2,myrand,0);
+      
+    }
+    break;
+  case 8: 
+    for(i=0;i<nb_test;i++)
+    {
+      if(ctr)
+	encrypt_ctr<8*8>(seq, seq2,len,RM1,Pbox,PboxRM,Sbox1,Sbox2,myrand,1);
+      else
+	encrypt<8*8>(seq, seq2,len,RM1,Pbox,PboxRM,Sbox1,Sbox2,myrand,0);
+      
+    }
+    break;
+  case 16: 
+    for(i=0;i<nb_test;i++)
+    {
+      if(ctr)
+	encrypt_ctr<16*16>(seq, seq2,len,RM1,Pbox,PboxRM,Sbox1,Sbox2,myrand,1);
+      else
+	encrypt<16*16>(seq, seq2,len,RM1,Pbox,PboxRM,Sbox1,Sbox2,myrand,0);
+      
+    }
+    break;
+  case 32: 
+    for(i=0;i<nb_test;i++)
+    {
+      if(ctr)
+	encrypt_ctr<32*32>(seq, seq2,len,RM1,Pbox,PboxRM,Sbox1,Sbox2,myrand,1);
+      else
+	encrypt<32*32>(seq, seq2,len,RM1,Pbox,PboxRM,Sbox1,Sbox2,myrand,0);
+      
+    }
+    break;
+  case 64: 
+    for(i=0;i<nb_test;i++)
+    {
+      if(ctr)
+	encrypt_ctr<64*64>(seq, seq2,len,RM1,Pbox,PboxRM,Sbox1,Sbox2,myrand,1);
+      else
+	encrypt<64*64>(seq, seq2,len,RM1,Pbox,PboxRM,Sbox1,Sbox2,myrand,0);
+      
+    }
+    break;
+  case 128: 
+    for(i=0;i<nb_test;i++)
+    {
+      if(ctr)
+	encrypt_ctr<128*128>(seq, seq2,len,RM1,Pbox,PboxRM,Sbox1,Sbox2,myrand,1);
+      else
+	encrypt<128*128>(seq, seq2,len,RM1,Pbox,PboxRM,Sbox1,Sbox2,myrand,0);
+      
+    }
+    break;
+  }
+  time_encrypt+=TimeStop(t);
+  //cout<<"Time encrypt "<<
+  cout<<(double)imsize*nb_test/time_encrypt<<"\t";
+
+
+  if(lena) {
+    for(int i=0;i<oneD;i++) {
+      data_R[i]=seq2[i];
+      data_G[i]=seq2[oneD+i];
+      data_B[i]=seq2[2*oneD+i];
+    }
+    store_RGB_pixmap("lena2.ppm", data_R, data_G, data_B, width, height);
+  }
+  
+
+  time_decrypt=0;
+  t=TimeStart();
+  switch(h) {
+  case 4:
+    for(i=0;i<nb_test;i++) {
+      if(ctr)
+	encrypt_ctr<4*4>(seq2, seq,len,RM1_copy,Pbox,PboxRM,Sbox1,Sbox2,myrand,0);
+      else
+	decrypt<4*4>(seq2,seq,len,RM1_copy,Pbox,PboxRM,Sbox1,Sbox2,Inv_Sbox1,Inv_Sbox2,myrand,0);
+    }
+    break;
+  case 8:
+    for(i=0;i<nb_test;i++) {
+      if(ctr)
+	encrypt_ctr<8*8>(seq2, seq,len,RM1_copy,Pbox,PboxRM,Sbox1,Sbox2,myrand,0);
+      else
+	decrypt<8*8>(seq2,seq,len,RM1_copy,Pbox,PboxRM,Sbox1,Sbox2,Inv_Sbox1,Inv_Sbox2,myrand,0);
+    }
+    break;
+  case 16:
+    for(i=0;i<nb_test;i++) {
+      if(ctr)
+	encrypt_ctr<16*16>(seq2, seq,len,RM1_copy,Pbox,PboxRM,Sbox1,Sbox2,myrand,0);
+      else
+	decrypt<16*16>(seq2,seq,len,RM1_copy,Pbox,PboxRM,Sbox1,Sbox2,Inv_Sbox1,Inv_Sbox2,myrand,0);
+    }
+    break;
+  case 32:
+    for(i=0;i<nb_test;i++) {
+      if(ctr)
+	encrypt_ctr<32*32>(seq2, seq,len,RM1_copy,Pbox,PboxRM,Sbox1,Sbox2,myrand,0);
+      else
+	decrypt<32*32>(seq2,seq,len,RM1_copy,Pbox,PboxRM,Sbox1,Sbox2,Inv_Sbox1,Inv_Sbox2,myrand,0);
+    }
+    break;
+  case 64:
+    for(i=0;i<nb_test;i++) {
+      if(ctr)
+	encrypt_ctr<64*64>(seq2, seq,len,RM1_copy,Pbox,PboxRM,Sbox1,Sbox2,myrand,0);
+      else
+	decrypt<64*64>(seq2,seq,len,RM1_copy,Pbox,PboxRM,Sbox1,Sbox2,Inv_Sbox1,Inv_Sbox2,myrand,0);
+    }
+    break;
+  case 128:
+    for(i=0;i<nb_test;i++) {
+      if(ctr)
+	encrypt_ctr<128*128>(seq2, seq,len,RM1_copy,Pbox,PboxRM,Sbox1,Sbox2,myrand,0);
+      else
+	decrypt<128*128>(seq2,seq,len,RM1_copy,Pbox,PboxRM,Sbox1,Sbox2,Inv_Sbox1,Inv_Sbox2,myrand,0);
+    }
+    break;
+  }
+
+  time_decrypt+=TimeStop(t);
+  //cout<<"Time decrypt "
+  cout<<(double)imsize*nb_test/time_decrypt<<"\t";
+
+  if(lena) {
+    for(int i=0;i<oneD;i++) {
+      data_R[i]=seq[i];
+      data_G[i]=seq[oneD+i];
+      data_B[i]=seq[2*oneD+i];
+    }
+    store_RGB_pixmap("lena3.ppm", data_R, data_G, data_B, width, height);
+  }
+  else {
+    bool equal=true;
+    for(int i=0;i<imsize;i++) {
+      //cout<<(int)buffer[i]<<endl;
+      if(buffer[i]!=seq[i]) {
+	equal=false;
+      }
+    }
+//    cout<<"RESULT CORRECT: "<<equal<<endl;
+  }
+  
+
+
+  return 0;
+}
diff --git a/OneRoundIoT/openssl/openssl_evp_hmac.c b/OneRoundIoT/openssl/openssl_evp_hmac.c
index 5e738ea..59f5f8a 100644
--- a/OneRoundIoT/openssl/openssl_evp_hmac.c
+++ b/OneRoundIoT/openssl/openssl_evp_hmac.c
@@ -134,7 +134,7 @@ int encrypt(unsigned char *plaintext, int plaintext_len, unsigned char *key,
 
   ciphertext_len += len;
 
-  //  printBytes(hash_sha256, result_len);
+  printBytes(hash_sha256, result_len);
   
   /*
   char *p = &hash_sha256_hex[0];