X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/Cipher_code.git/blobdiff_plain/8447de27d254ebc4b598b4209d62a3ead3bbc343..ca940d4b9b6ef86858b8c2e8dcffce5602cbbbae:/OneRoundIoT/OneRound/one_round_new.cpp?ds=sidebyside

diff --git a/OneRoundIoT/OneRound/one_round_new.cpp b/OneRoundIoT/OneRound/one_round_new.cpp
index a222855..de1b0d2 100644
--- a/OneRoundIoT/OneRound/one_round_new.cpp
+++ b/OneRoundIoT/OneRound/one_round_new.cpp
@@ -6,6 +6,7 @@
 #include<math.h>
 #include<stdlib.h>
 #include<stdio.h>
+#include<string.h>
 #include <fstream>
 #include <sys/time.h>
 
@@ -28,9 +29,11 @@ using namespace std;
 
 int key_size=256;
 int nb_test=1;
+int ctr=0;
+int h=64;
 
-const int h=16;
-const int h2=h*h;
+
+int h2=h*h;
 
 
 
@@ -66,6 +69,14 @@ void inverse_tables(uchar *tab, int size_tab,uchar *inv_perm_tabs) {
 
 }
 
+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) {
@@ -125,6 +136,61 @@ void prga(uchar *sc, int ldata, uchar *r) {
 
 
 
+void encrypt_ctr(uchar* seq_in, uchar *seq_out, int len,uchar* RM1,int *Pbox, int *PboxRM, uchar *Sbox1, uchar *Sbox2, int enc) {
+
+
+  uchar *X=new uchar[h2];
+  uchar *fX=new uchar[h2];
+  int ind1,ind2;
+
+
+   for(int a=0;a<h2;a++) {
+     X[a]=Sbox1[a];
+   }
+
+   
+  for(int it=0;it<len;it++) {
+    if(enc) {
+      ind1=it*h2;
+      ind2=Pbox[it]*h2;
+    }
+    else {
+      ind2=it*h2;
+      ind1=Pbox[it]*h2;
+    }
+       
+
+
+    for(int a=0;a<h2;a++){
+      fX[a]=Sbox1[RM1[X[a]]];
+    }
+    
+
+    for(int a=0;a<h2;a++) {
+      fX[a]=fX[a]^RM1[a];
+    }
+
+ 
+    for(int a=0;a<h2;a++) {
+      fX[a]=Sbox2[fX[a]];
+    }
+    
+ 
+    for(int a=0;a<h2;a++) {
+      seq_out[ind1+a]=fX[a]^seq_in[ind2+a];
+    }
+    
+    for(int a=0;a<h2;a++) {
+      RM1[a]=RM1[PboxRM[a]];
+    }
+
+
+    
+  }
+
+
+}
+
 
 
 void encrypt(uchar* seq_in, uchar *seq_out, int len,uchar* RM1,int *Pbox, int *PboxRM, uchar *Sbox1, uchar *Sbox2, int debug) {
@@ -132,37 +198,77 @@ void encrypt(uchar* seq_in, uchar *seq_out, int len,uchar* RM1,int *Pbox, int *P
 
   uchar *X=new uchar[h2];
   uchar *fX=new uchar[h2];
-  
+  unsigned int *lX=(unsigned int*)X;
+  unsigned int *lseq_in=(unsigned int*)seq_in;
+
+
   for(int it=0;it<len;it++) {
     int ind1=it*h2;
     int ind2=Pbox[it]*h2;
 
-    for(int a=0;a<h2;a++) {
+    for(int a=0;a<h2;a+=1) {
       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];
+      /*      X[a+4]=seq_in[ind2+a+4];                                                                                                                                    
+      X[a+5]=seq_in[ind2+a+5];                                                                                                                                            
+      X[a+6]=seq_in[ind2+a+6];                                                                                                                                            
+      X[a+7]=seq_in[ind2+a+7];*/
     }
 
-    for(int a=0;a<h2;a++){
+    for(int a=0;a<h2;a+=1){
       fX[a]=Sbox1[X[a]];
+/*      fX[a+1]=Sbox1[X[a+1]];
+      fX[a+2]=Sbox1[X[a+2]];
+      fX[a+3]=Sbox1[X[a+3]];
+      /*      fX[a+4]=Sbox1[X[a+4]];                                                                                                                                      
+      fX[a+5]=Sbox1[X[a+5]];                                                                                                                                              
+      fX[a+6]=Sbox1[X[a+6]];                                                                                                                                              
+      fX[a+7]=Sbox1[X[a+7]];*/
     }
-    
 
-    for(int a=0;a<h2;a++) {
+
+    for(int a=0;a<h2;a+=1) {
       fX[a]=fX[a]^RM1[a];
+/*      fX[a+1]=fX[a+1]^RM1[a+1];
+      fX[a+2]=fX[a+2]^RM1[a+2];
+      fX[a+3]=fX[a+3]^RM1[a+3];
+      /*      fX[a+4]=fX[a+4]^RM1[a+4];                                                                                                                                   
+      fX[a+5]=fX[a+5]^RM1[a+5];                                                                                                                                           
+      fX[a+6]=fX[a+6]^RM1[a+6];                                                                                                                                           
+      fX[a+7]=fX[a+7]^RM1[a+7];*/
     }
 
 
-    for(int a=0;a<h2;a++) {
+    for(int a=0;a<h2;a+=1) {
       seq_out[ind1+a]=Sbox2[fX[a]];
+/*      seq_out[ind1+a+1]=Sbox2[fX[a+1]];
+      seq_out[ind1+a+2]=Sbox2[fX[a+2]];
+      seq_out[ind1+a+3]=Sbox2[fX[a+3]];
+      /*      seq_out[ind1+a+4]=Sbox2[fX[a+4]];                                                                                                                           
+      seq_out[ind1+a+5]=Sbox2[fX[a+5]];                                                                                                                                   
+      seq_out[ind1+a+6]=Sbox2[fX[a+6]];                                                                                                                                   
+      seq_out[ind1+a+7]=Sbox2[fX[a+7]];*/
     }
 
-    for(int a=0;a<h2;a++) {
+    for(int a=0;a<h2;a+=1) {
       RM1[a]=RM1[PboxRM[a]];
+/*      RM1[a+1]=RM1[PboxRM[a+1]];
+      RM1[a+2]=RM1[PboxRM[a+2]];
+      RM1[a+3]=RM1[PboxRM[a+3]];
+      /*      RM1[a+4]=RM1[PboxRM[a+4]];                                                                                                                                  
+      RM1[a+5]=RM1[PboxRM[a+5]];                                                                                                                                          
+      RM1[a+6]=RM1[PboxRM[a+6]];                                                                                                                                          
+      RM1[a+7]=RM1[PboxRM[a+7]];*/
     }
 
-    
+
   }
 
 
+
+
 }
 
 
@@ -215,8 +321,47 @@ void decrypt(uchar* seq_in, uchar *seq_out, int len,uchar* RM1,int *Pbox, int *P
 }
 
 
+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],"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]));          //CTR ? 1  otherwise CBC like
+  }
 
-void Dynamickeygenerationnew(uchar *Secretkey, uchar *counter) {
+  printf("nb times %d\n",nb_test);
+  printf("ctr %d\n",ctr);
+  printf("h %d\n",h);
+
+  h2=h*h;
+  
+/*
+  if(argc==2)
+    nb_test=atoi(argv[1]);
+  if(nb_test<=0 || nb_test>10000) {
+    printf("nb tests is not correct\n");
+    exit(0);
+  }
+  else
+    printf("nb tests = %d\n\n",nb_test);
+*/
+
+      
+  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];
 
@@ -227,6 +372,7 @@ void Dynamickeygenerationnew(uchar *Secretkey, uchar *counter) {
   int height;
   uchar *data_R, *data_G, *data_B;
   load_RGB_pixmap("lena.ppm", &width, &height, &data_R, &data_G, &data_B);
+//  load_RGB_pixmap("No_ecb_mode_picture.ppm", &width, &height, &data_R, &data_G, &data_B);
 
 
 
@@ -259,14 +405,9 @@ void Dynamickeygenerationnew(uchar *Secretkey, uchar *counter) {
 
     
   for (int i = 0; i < 256 ; i++) {
-//      mix[i]=(int)secret_key.BytePtr()[i]^(int)mycounter.BytePtr()[i];
     mix[i]=Secretkey[i]^counter[i];
   }
 
-/*  byte digest[64];
-  SHA512().CalculateDigest(digest, mix, 256);
-*/
-
   
   cout<<"hash "<<endl;
   for (int i = 0; i < 64 ; i++) {
@@ -332,7 +473,11 @@ void Dynamickeygenerationnew(uchar *Secretkey, uchar *counter) {
   int i;
   for(i=0;i<nb_test;i++)
   {
-    encrypt(seq, seq2,len,RM1,Pbox,PboxRM,Sbox1,Sbox2,0);
+    if(ctr)
+      encrypt_ctr(seq, seq2,len,RM1,Pbox,PboxRM,Sbox1,Sbox2,1);
+    else
+      encrypt(seq, seq2,len,RM1,Pbox,PboxRM,Sbox1,Sbox2,0);
+
   }
   
   time+=TimeStop(t);
@@ -350,7 +495,11 @@ void Dynamickeygenerationnew(uchar *Secretkey, uchar *counter) {
   time=0;
   t=TimeStart();
   for(i=0;i<nb_test;i++) {
-    decrypt(seq2,seq,len,RM2,Pbox,PboxRM,Sbox1,Sbox2,0);
+    if(ctr)
+      encrypt_ctr(seq2, seq,len,RM2,Pbox,PboxRM,Sbox1,Sbox2,0);
+    else
+      decrypt(seq2,seq,len,RM2,Pbox,PboxRM,Sbox1,Sbox2,0);
+
   }
 
   time+=TimeStop(t);
@@ -366,41 +515,5 @@ void Dynamickeygenerationnew(uchar *Secretkey, uchar *counter) {
   
 
 
-
-
-}
-
-
-
-int main(int argc, char** argv) {
-  cout << "Hello, World!" << endl;
-
-
- 
-
-  if(argc==2)
-    nb_test=atoi(argv[1]);
-  if(nb_test<=0 || nb_test>10000) {
-    printf("nb tests is not correct\n");
-    exit(0);
-  }
-  else
-    printf("nb tests = %d\n\n",nb_test);
-
-  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;
-  }
-
-  Dynamickeygenerationnew(Secretkey, counter);
-
   return 0;
 }