From: couturie <couturie@extinction>
Date: Thu, 24 Aug 2017 20:14:23 +0000 (+0200)
Subject: new
X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/Cipher_code.git/commitdiff_plain/8e7ce26ffa675a1249751a2a2e5d3b5c1cdc0553?ds=sidebyside;hp=66f2180dbe8a7262017622f9f9e4cfedba66fc32

new
---

diff --git a/OneRoundIoT/OneRound/one_round_new.cpp b/OneRoundIoT/OneRound/one_round_new.cpp
index 165fb19..77efe34 100644
--- a/OneRoundIoT/OneRound/one_round_new.cpp
+++ b/OneRoundIoT/OneRound/one_round_new.cpp
@@ -372,7 +372,7 @@ 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]));          //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
   }
@@ -658,8 +658,10 @@ int main(int argc, char** argv) {
   else {
     bool equal=true;
     for(int i=0;i<imsize;i++) {
-      if(buffer[i]!=seq[i])
+      //cout<<(int)buffer[i]<<endl;
+      if(buffer[i]!=seq[i]) {
 	equal=false;
+      }
     }
     cout<<"RESULT CORRECT: "<<equal<<endl;
   }
diff --git a/OneRoundIoT/openssl/openssl_evp.c b/OneRoundIoT/openssl/openssl_evp.c
index b452b9a..bd4243a 100644
--- a/OneRoundIoT/openssl/openssl_evp.c
+++ b/OneRoundIoT/openssl/openssl_evp.c
@@ -155,15 +155,24 @@ int main (int argc, char** argv)
    * real application? :-)
    */
 
-   for(int i=1; i<argc; i++){
+  int size_buf=1;
+  int lena=0;
+
+   
+  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],"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("lena %d\n",lena);
+  printf("size_buf %d\n",size_buf);
+
+
 
-  
 
   
   /* A 256 bit key */
@@ -183,29 +192,48 @@ int main (int argc, char** argv)
   int width;
   int height;
   uchar *data_R, *data_G, *data_B;
-  load_RGB_pixmap("lena.ppm", &width, &height, &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);
+    imsize=width*height*3;
 //  load_RGB_pixmap("No_ecb_mode_picture.ppm", &width, &height, &data_R, &data_G, &data_B);
-//  load_RGB_pixmap("4096.ppm", &width, &height, &data_R, &data_G, &data_B);
-  int size=width*height*3;
+  }
+  else {
+    width=height=size_buf;
+    imsize=width*height;
+    buffer=malloc(imsize*sizeof(uchar));
+    for(int i=0;i<imsize;i++) {
+      buffer[i]=lrand48();
+    }
+  }
+  
 
-  int oneD=width*height;
-  uchar *plaintext = malloc(size);
 
-  
-  for(int i=0;i<oneD;i++) {
-    plaintext[i]=data_R[i];
-    plaintext[oneD+i]=data_G[i];
-    plaintext[2*oneD+i]=data_B[i];
+  int oneD=width*height;
+  uchar *plaintext = malloc(imsize);
+  if(lena) {
+    for(int i=0;i<oneD;i++) {
+      plaintext[i]=data_R[i];
+      plaintext[oneD+i]=data_G[i];
+      plaintext[2*oneD+i]=data_B[i];
+    }
+  }
+  else
+  {
+     for(int i=0;i<oneD;i++) {
+       plaintext[i]=buffer[i];
+    }
   }
 
   
 
-  uchar *ciphertext = malloc(size);
+  uchar *ciphertext = malloc(imsize);
 
   /* Buffer for the decrypted text */
-  uchar *decryptedtext = malloc(size);
+  uchar *decryptedtext = malloc(imsize);
 
   int decryptedtext_len, ciphertext_len;
 
@@ -225,7 +253,7 @@ int main (int argc, char** argv)
 
   for(i=0;i<nb_test;i++)
   {  
-    ciphertext_len = encrypt (plaintext, size, key, iv,
+    ciphertext_len = encrypt (plaintext, imsize, key, iv,
 			      ciphertext, ctr);
   }
 
@@ -233,13 +261,14 @@ int main (int argc, char** argv)
 
  printf("Time encrypt %f\n",time);
 
-
- for(int i=0;i<oneD;i++) {
-    data_R[i]=ciphertext[i];
-    data_G[i]=ciphertext[oneD+i];
-    data_B[i]=ciphertext[2*oneD+i];
-  }
-  store_RGB_pixmap("lena2.ppm", data_R, data_G, data_B, width, height);		   
+ if(lena) {
+   for(int i=0;i<oneD;i++) {
+     data_R[i]=ciphertext[i];
+     data_G[i]=ciphertext[oneD+i];
+     data_B[i]=ciphertext[2*oneD+i];
+   }
+   store_RGB_pixmap("lena2.ppm", data_R, data_G, data_B, width, height);
+ }
  
   
   time=0;
@@ -257,14 +286,24 @@ int main (int argc, char** argv)
 
  printf("Time decrypt %f\n",time);
 
-
-  for(int i=0;i<oneD;i++) {
-    data_R[i]=decryptedtext[i];
-    data_G[i]=decryptedtext[oneD+i];
-    data_B[i]=decryptedtext[2*oneD+i];
-  }
-  store_RGB_pixmap("lena3.ppm", data_R, data_G, data_B, width, height);		    
-
+ if(lena) {
+   for(int i=0;i<oneD;i++) {
+     data_R[i]=decryptedtext[i];
+     data_G[i]=decryptedtext[oneD+i];
+     data_B[i]=decryptedtext[2*oneD+i];
+   }
+   store_RGB_pixmap("lena3.ppm", data_R, data_G, data_B, width, height);
+ }
+ else {
+   int equal=1;
+   for(int i=0;i<imsize;i++) {
+     //cout<<(int)buffer[i]<<endl;
+     if(buffer[i]!=decryptedtext[i]) {
+       equal=0;
+     }
+   }
+   printf("RESULT CORRECT: %d\n",equal);
+ }
   
 
   /* Clean up */