From 137f8adedb33df733dd981cb3d4b68bc6d1c9b33 Mon Sep 17 00:00:00 2001
From: couturie <couturie@extinction>
Date: Fri, 18 Aug 2017 18:36:36 +0200
Subject: [PATCH] new

---
 OneRoundIoT/OneRound/one_round_new.cpp | 134 ++++++++++++++-----------
 OneRoundIoT/openssl/Makefile           |   1 -
 2 files changed, 75 insertions(+), 60 deletions(-)

diff --git a/OneRoundIoT/OneRound/one_round_new.cpp b/OneRoundIoT/OneRound/one_round_new.cpp
index de1b0d2..9046044 100644
--- a/OneRoundIoT/OneRound/one_round_new.cpp
+++ b/OneRoundIoT/OneRound/one_round_new.cpp
@@ -30,10 +30,10 @@ using namespace std;
 int key_size=256;
 int nb_test=1;
 int ctr=0;
-int h=64;
+const int h=32;
 
 
-int h2=h*h;
+const int h2=h*h;
 
 
 
@@ -143,9 +143,9 @@ void encrypt_ctr(uchar* seq_in, uchar *seq_out, int len,uchar* RM1,int *Pbox, in
   uchar *fX=new uchar[h2];
   int ind1,ind2;
 
-
+  
    for(int a=0;a<h2;a++) {
-     X[a]=Sbox1[a];
+     X[a]=Sbox2[a];
    }
 
    
@@ -161,27 +161,54 @@ void encrypt_ctr(uchar* seq_in, uchar *seq_out, int len,uchar* RM1,int *Pbox, in
        
 
 
-    for(int a=0;a<h2;a++){
-      fX[a]=Sbox1[RM1[X[a]]];
+    for(int a=0;a<h2;a+=4){
+      fX[a]=RM1[X[a]];
+      fX[a+1]=RM1[X[a+1]];
+      fX[a+2]=RM1[X[a+2]];
+      fX[a+3]=RM1[X[a+3]];
     }
-    
 
-    for(int a=0;a<h2;a++) {
+    /*   if(it==0) {
+      for(int a=0;a<h2;a++)
+	printf("%d ",fX[a]);
+      printf("\n");
+      }*/
+
+    for(int a=0;a<h2;a+=4) {
       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];
     }
 
  
-    for(int a=0;a<h2;a++) {
+    for(int a=0;a<h2;a+=4) {
       fX[a]=Sbox2[fX[a]];
+      fX[a+1]=Sbox2[fX[a+1]];
+      fX[a+2]=Sbox2[fX[a+2]];
+      fX[a+3]=Sbox2[fX[a+3]];
     }
     
+     for(int a=0;a<h2;a+=4) {
+      fX[a]=fX[a]^seq_in[ind2+a];
+      fX[a+1]=fX[a+1]^seq_in[ind2+a+1];
+      fX[a+2]=fX[a+2]^seq_in[ind2+a+2];
+      fX[a+3]=fX[a+3]^seq_in[ind2+a+3];
+    }
+
  
-    for(int a=0;a<h2;a++) {
-      seq_out[ind1+a]=fX[a]^seq_in[ind2+a];
+    for(int a=0;a<h2;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];
     }
     
-    for(int a=0;a<h2;a++) {
+    for(int a=0;a<h2;a+=4) {
       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]];
     }
 
 
@@ -206,61 +233,42 @@ void encrypt(uchar* seq_in, uchar *seq_out, int len,uchar* RM1,int *Pbox, int *P
     int ind1=it*h2;
     int ind2=Pbox[it]*h2;
 
-    for(int a=0;a<h2;a+=1) {
+    for(int a=0;a<h2;a+=4) {
       X[a]=seq_in[ind2+a];
-/*      X[a+1]=seq_in[ind2+a+1];
+      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+=1){
+    for(int a=0;a<h2;a+=4){
       fX[a]=Sbox1[X[a]];
-/*      fX[a+1]=Sbox1[X[a+1]];
+      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+=1) {
+    for(int a=0;a<h2;a+=4) {
       fX[a]=fX[a]^RM1[a];
-/*      fX[a+1]=fX[a+1]^RM1[a+1];
+      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+=1) {
+    for(int a=0;a<h2;a+=4) {
       seq_out[ind1+a]=Sbox2[fX[a]];
-/*      seq_out[ind1+a+1]=Sbox2[fX[a+1]];
+      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+=1) {
+    for(int a=0;a<h2;a+=4) {
       RM1[a]=RM1[PboxRM[a]];
-/*      RM1[a+1]=RM1[PboxRM[a+1]];
+      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]];*/
+
     }
 
 
@@ -296,22 +304,38 @@ void decrypt(uchar* seq_in, uchar *seq_out, int len,uchar* RM1,int *Pbox, int *P
 
 
 
-    for(int a=0;a<h2;a++) {
+    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;a++) {
+    for(int a=0;a<h2;a+=4) {
       fX[a]=Inv_Sbox2[fX[a]];
+      fX[a+1]=Inv_Sbox2[fX[a+1]];
+      fX[a+2]=Inv_Sbox2[fX[a+2]];
+      fX[a+3]=Inv_Sbox2[fX[a+3]];
     }
-    for(int a=0;a<h2;a++) {
+    for(int a=0;a<h2;a+=4) {
       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];
     }
 
-    for(int a=0;a<h2;a++) {
+    for(int a=0;a<h2;a+=4) {
       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]];
     }
     
-    for(int a=0;a<h2;a++) {
+    for(int a=0;a<h2;a+=4) {
       seq_out[ind2+a]=Inv_Sbox1[fX[a]];
+      seq_out[ind2+a+1]=Inv_Sbox1[fX[a+1]];
+      seq_out[ind2+a+2]=Inv_Sbox1[fX[a+2]];
+      seq_out[ind2+a+3]=Inv_Sbox1[fX[a+3]];
     }
 
      
@@ -327,25 +351,15 @@ 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
+//    if(strncmp(argv[i],"h",1)==0) h = atoi(&(argv[i][1]));          //CTR ? 1  otherwise CBC like
   }
 
   printf("nb times %d\n",nb_test);
   printf("ctr %d\n",ctr);
   printf("h %d\n",h);
 
-  h2=h*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);
@@ -465,6 +479,8 @@ int main(int argc, char** argv) {
   for(int i=0;i<h2;i++){
     RM2[i]=RM1[i];
   }
+  int *Inv_Pbox=new int[len];
+  inverse_tables_int(Pbox,len,Inv_Pbox);
   
  
  double time=0;
diff --git a/OneRoundIoT/openssl/Makefile b/OneRoundIoT/openssl/Makefile
index d123b57..c3cf5b7 100644
--- a/OneRoundIoT/openssl/Makefile
+++ b/OneRoundIoT/openssl/Makefile
@@ -6,7 +6,6 @@ OBJ =    pixmap_io.o openssl_evp.o
 openssl_evp: $(OBJ)
 	$(C) -o $@ $^ $(CFLAGS)
 
-
 %.o: %.c 
 	$(C) -c -o $@ $< 
 
-- 
2.39.5