improvement

[Cipher_code.git] / OneRoundIoT / openssl / openssl_evp.c

diff --git a/OneRoundIoT/openssl/openssl_evp.c b/OneRoundIoT/openssl/openssl_evp.c
index bd4243a80bc2c572eec69e6ecbe1fe4ab6ff0d36..90441f1596ebff92ab989d527497d9df209c1adb 100644 (file)
--- a/OneRoundIoT/openssl/openssl_evp.c
+++ b/OneRoundIoT/openssl/openssl_evp.c
@@ -41,7 +41,7 @@ void handleErrors(void)
 
 
 int encrypt(unsigned char *plaintext, int plaintext_len, unsigned char *key,
 
 
 int encrypt(unsigned char *plaintext, int plaintext_len, unsigned char *key,

-           unsigned char *iv, unsigned char *ciphertext, int ctr)
+           unsigned char *iv, unsigned char *ciphertext, int ctr, int index)

 {
   EVP_CIPHER_CTX *ctx;
 
 {
   EVP_CIPHER_CTX *ctx;
 


@@ -57,7 +57,9 @@ int encrypt(unsigned char *plaintext, int plaintext_len, unsigned char *key,
    * In this example we are using 256 bit AES (i.e. a 256 bit key). The
    * IV size for *most* modes is the same as the block size. For AES this
    * is 128 bits */
    * In this example we are using 256 bit AES (i.e. a 256 bit key). The
    * IV size for *most* modes is the same as the block size. For AES this
    * is 128 bits */

-
+  //static double  time=0;
+  //double t=0;
+  //t=TimeStart();

   //256
   //avant ecb
   if(ctr) {
   //256
   //avant ecb
   if(ctr) {


@@ -68,6 +70,10 @@ int encrypt(unsigned char *plaintext, int plaintext_len, unsigned char *key,
       if(1 != EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv))
        handleErrors();
 
       if(1 != EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv))
        handleErrors();
 

+  //time+=TimeStop(t);
+  //printf("Time init %f\n",time);
+
+  

 //  int cipherBlockSize = EVP_CIPHER_CTX_block_size(ctx);  
 //  printf("INFO(evp_encrypt): block size: %d\n", cipherBlockSize);
 
 //  int cipherBlockSize = EVP_CIPHER_CTX_block_size(ctx);  
 //  printf("INFO(evp_encrypt): block size: %d\n", cipherBlockSize);
 


@@ -76,14 +82,24 @@ int encrypt(unsigned char *plaintext, int plaintext_len, unsigned char *key,
    * EVP_EncryptUpdate can be called multiple times if necessary
    */
 
    * EVP_EncryptUpdate can be called multiple times if necessary
    */
 

-  if(1 != EVP_EncryptUpdate(ctx, ciphertext, &len, plaintext, plaintext_len))
-    handleErrors();
-  ciphertext_len = len;
-
+/*
+  static double  time=0;
+  double t=0;
+  t=TimeStart();
+*/
+  for(int i=0;i<nb_test;i++)
+  {  

   
   

-
-
-
+      if(1 != EVP_EncryptUpdate(ctx, ciphertext, &len, plaintext, plaintext_len))
+      handleErrors();
+    ciphertext_len = len;
+    
+  }
+/*  time+=TimeStop(t);
+  // if(index==nb_test-1)
+  printf("Time encrypt %f\n",time);
+    
+*/

 
   
   /* Finalise the encryption. Further ciphertext bytes may be written at
 
   
   /* Finalise the encryption. Further ciphertext bytes may be written at


@@ -99,7 +115,7 @@ int encrypt(unsigned char *plaintext, int plaintext_len, unsigned char *key,
 }
 
 int decrypt(unsigned char *ciphertext, int ciphertext_len, unsigned char *key,
 }
 
 int decrypt(unsigned char *ciphertext, int ciphertext_len, unsigned char *key,

-           unsigned char *iv, unsigned char *plaintext, int ctr)
+           unsigned char *iv, unsigned char *plaintext, int ctr, int index)

 {
   EVP_CIPHER_CTX *ctx;
 
 {
   EVP_CIPHER_CTX *ctx;
 


@@ -131,17 +147,31 @@ int decrypt(unsigned char *ciphertext, int ciphertext_len, unsigned char *key,
    * EVP_DecryptUpdate can be called multiple times if necessary
    */
   
    * EVP_DecryptUpdate can be called multiple times if necessary
    */
   

- 
-  if(1 != EVP_DecryptUpdate(ctx, plaintext, &len, ciphertext, ciphertext_len))
-    handleErrors();
-  plaintext_len = len;
+/*  static double time=0;
+  double t=0;
+  t=TimeStart();
+*/
+  for(int i=0;i<nb_test;i++)
+  {  
+    plaintext_len = 0;
+    if(1 != EVP_DecryptUpdate(ctx, plaintext, &len, ciphertext, ciphertext_len))
+      handleErrors();
+    plaintext_len = len;
+  }
+/*  time+=TimeStop(t);
+//  if(index==nb_test-1)
+    printf("Time decrypt %f\n",time);
+*/

 
 

+  

   /* Finalise the decryption. Further plaintext bytes may be written at
    * this stage.
    */
   if(1 != EVP_DecryptFinal_ex(ctx, plaintext + len, &len)) handleErrors();
   plaintext_len += len;
 
   /* Finalise the decryption. Further plaintext bytes may be written at
    * this stage.
    */
   if(1 != EVP_DecryptFinal_ex(ctx, plaintext + len, &len)) handleErrors();
   plaintext_len += len;
 

+  
+  

   /* Clean up */
   EVP_CIPHER_CTX_free(ctx);
 
   /* Clean up */
   EVP_CIPHER_CTX_free(ctx);
 


@@ -166,11 +196,11 @@ int main (int argc, char** argv)
     if(strncmp(argv[i],"lena",4)==0) lena = atoi(&(argv[i][4]));          //Use Lena or 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("nb times %d\n",nb_test);

   printf("ctr %d\n",ctr);
   printf("lena %d\n",lena);
   printf("size_buf %d\n",size_buf);
   printf("ctr %d\n",ctr);
   printf("lena %d\n",lena);
   printf("size_buf %d\n",size_buf);

-
+*/

 
 
 
 
 
 


@@ -202,7 +232,8 @@ int main (int argc, char** argv)
 //  load_RGB_pixmap("No_ecb_mode_picture.ppm", &width, &height, &data_R, &data_G, &data_B);
   }
   else {
 //  load_RGB_pixmap("No_ecb_mode_picture.ppm", &width, &height, &data_R, &data_G, &data_B);
   }
   else {

-    width=height=size_buf;
+    width=size_buf;
+    height=size_buf;

     imsize=width*height;
     buffer=malloc(imsize*sizeof(uchar));
     for(int i=0;i<imsize;i++) {
     imsize=width*height;
     buffer=malloc(imsize*sizeof(uchar));
     for(int i=0;i<imsize;i++) {


@@ -213,7 +244,7 @@ int main (int argc, char** argv)
 
 
   int oneD=width*height;
 
 
   int oneD=width*height;

-  uchar *plaintext = malloc(imsize);
+  uchar *plaintext = malloc(imsize+1000);   //add that for cbc

   if(lena) {
     for(int i=0;i<oneD;i++) {
       plaintext[i]=data_R[i];
   if(lena) {
     for(int i=0;i<oneD;i++) {
       plaintext[i]=data_R[i];


@@ -230,10 +261,10 @@ int main (int argc, char** argv)
 
   
 
 
   
 

-  uchar *ciphertext = malloc(imsize);
+  uchar *ciphertext = malloc(imsize+1000); //add that for cbc

 
   /* Buffer for the decrypted text */
 
   /* Buffer for the decrypted text */

-  uchar *decryptedtext = malloc(imsize);
+  uchar *decryptedtext = malloc(imsize+1000); //add that for cbc

 
   int decryptedtext_len, ciphertext_len;
 
 
   int decryptedtext_len, ciphertext_len;
 


@@ -242,7 +273,10 @@ int main (int argc, char** argv)
   OpenSSL_add_all_algorithms();
   OPENSSL_config(NULL);
 */
   OpenSSL_add_all_algorithms();
   OPENSSL_config(NULL);
 */

-   double time=0;
+
+
+  double time_encrypt=0;
+  double time_decrypt=0;

   double t=TimeStart();
 
   
   double t=TimeStart();
 
   


@@ -251,15 +285,16 @@ int main (int argc, char** argv)
 
   int i;
 
 
   int i;
 

-  for(i=0;i<nb_test;i++)
+//  for(i=0;i<nb_test;i++)

   {  
     ciphertext_len = encrypt (plaintext, imsize, key, iv,
   {  
     ciphertext_len = encrypt (plaintext, imsize, key, iv,

-                             ciphertext, ctr);
+                             ciphertext, ctr, i );

   }
 
   }
 

- time+=TimeStop(t);
+ time_encrypt+=TimeStop(t);

 
 

- printf("Time encrypt %f\n",time);
+// printf("Time encrypt %f\n",time);
+ printf("%f\t",(double)imsize*nb_test/time_encrypt);

 
  if(lena) {
    for(int i=0;i<oneD;i++) {
 
  if(lena) {
    for(int i=0;i<oneD;i++) {


@@ -271,20 +306,20 @@ int main (int argc, char** argv)
  }
  
   
  }
  
   

-  time=0;

   t=0;
   t=TimeStart();
 
   t=0;
   t=TimeStart();
 

-  for(int i=0;i<nb_test;i++)
+  //for(int i=0;i<nb_test;i++)

   {  
     /* Decrypt the ciphertext */
     decryptedtext_len = decrypt(ciphertext, ciphertext_len, key, iv,
   {  
     /* Decrypt the ciphertext */
     decryptedtext_len = decrypt(ciphertext, ciphertext_len, key, iv,

-                               decryptedtext,ctr);
+                               decryptedtext,ctr, i);

   }
 
   }
 

- time+=TimeStop(t);
+ time_decrypt+=TimeStop(t);

 
 

- printf("Time decrypt %f\n",time);
+ //printf("Time decrypt %f\n",time);
+ printf("%f\t",(double)imsize*nb_test/time_decrypt);

 
  if(lena) {
    for(int i=0;i<oneD;i++) {
 
  if(lena) {
    for(int i=0;i<oneD;i++) {


@@ -302,7 +337,7 @@ int main (int argc, char** argv)
        equal=0;
      }
    }
        equal=0;
      }
    }

-   printf("RESULT CORRECT: %d\n",equal);
+//   printf("RESULT CORRECT: %d\n",equal);

  }
   
 
  }