From: couturie <couturie@extinction>
Date: Sat, 26 Aug 2017 12:21:35 +0000 (+0200)
Subject: new
X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/Cipher_code.git/commitdiff_plain/4629a687773ce4bec8abd94d0577f541ce1438ed?hp=656b608a022c716868f21e2aa84da15fb6aa4e86

new
---

diff --git a/OneRoundIoT/openssl/openssl_evp.c b/OneRoundIoT/openssl/openssl_evp.c
index be8eb74..8bbd357 100644
--- a/OneRoundIoT/openssl/openssl_evp.c
+++ b/OneRoundIoT/openssl/openssl_evp.c
@@ -76,12 +76,12 @@ int encrypt(unsigned char *plaintext, int plaintext_len, unsigned char *key,
    * EVP_EncryptUpdate can be called multiple times if necessary
    */
 
-
+/*
   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++)
   {  
   
     
@@ -90,11 +90,11 @@ int encrypt(unsigned char *plaintext, int plaintext_len, unsigned char *key,
     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
@@ -142,20 +142,21 @@ int decrypt(unsigned char *ciphertext, int ciphertext_len, unsigned char *key,
    * EVP_DecryptUpdate can be called multiple times if necessary
    */
   
-  static double time=0;
+/*  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++)
   {  
     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);
+*/
+
   
   /* Finalise the decryption. Further plaintext bytes may be written at
    * this stage.
@@ -163,6 +164,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;
 
+  
+  
   /* Clean up */
   EVP_CIPHER_CTX_free(ctx);
 
@@ -274,7 +277,7 @@ int main (int argc, char** argv)
 
   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 );
@@ -298,7 +301,7 @@ int main (int argc, char** argv)
   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,