new

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

diff --git a/OneRoundIoT/openssl/openssl_evp.c b/OneRoundIoT/openssl/openssl_evp.c
index be8eb742891684d80b1f3c0e38420119eb83f96d..fd4dd257db1a26a750669f3ce6c179a0a6fcbfce 100644 (file)
--- a/OneRoundIoT/openssl/openssl_evp.c
+++ b/OneRoundIoT/openssl/openssl_evp.c
@@ -76,25 +76,25 @@ 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
    */
 

-
+/*

   static double  time=0;
   double t=0;
   t=TimeStart();
   static double  time=0;
   double t=0;
   t=TimeStart();

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

   {  
   
   {  
   

-    
+    ciphertext_len = 0;

     if(1 != EVP_EncryptUpdate(ctx, ciphertext, &len, plaintext, plaintext_len))
       handleErrors();
     ciphertext_len = len;
     
   }
     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);
+/*  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


@@ -142,20 +142,22 @@ 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
    */
   

-  static double time=0;
+/*  static double time=0;

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

-
-//  for(int i=0;i<nb_test;i++)
+*/
+  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;
   }
     if(1 != EVP_DecryptUpdate(ctx, plaintext, &len, ciphertext, ciphertext_len))
       handleErrors();
     plaintext_len = len;
   }

-
-  time+=TimeStop(t);
-  if(index==nb_test-1)
+/*  time+=TimeStop(t);
+//  if(index==nb_test-1)

     printf("Time decrypt %f\n",time);
     printf("Time decrypt %f\n",time);

+*/
+

   
   /* Finalise the decryption. Further plaintext bytes may be written at
    * this stage.
   
   /* Finalise the decryption. Further plaintext bytes may be written at
    * this stage.


@@ -163,6 +165,8 @@ int decrypt(unsigned char *ciphertext, int ciphertext_len, unsigned char *key,
   if(1 != EVP_DecryptFinal_ex(ctx, plaintext + len, &len)) handleErrors();
   plaintext_len += len;
 
   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);
 


@@ -274,7 +278,7 @@ 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, ctr, i );
   {  
     ciphertext_len = encrypt (plaintext, imsize, key, iv,
                              ciphertext, ctr, i );


@@ -298,7 +302,7 @@ int main (int argc, char** argv)
   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,


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

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

  }
   
 
  }