X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/Cipher_code.git/blobdiff_plain/0cfc0f796f3128e0c375e90c901ede9dbf7d2a6c..77e5a4ed08f9f2f3134323df80307de602d00800:/OneRoundIoT/openssl/openssl_evp.c?ds=sidebyside

diff --git a/OneRoundIoT/openssl/openssl_evp.c b/OneRoundIoT/openssl/openssl_evp.c
index 4e99565..6860932 100644
--- a/OneRoundIoT/openssl/openssl_evp.c
+++ b/OneRoundIoT/openssl/openssl_evp.c
@@ -57,11 +57,14 @@ 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 */
-  static double  time=0;
-  double t=0;
-  t=TimeStart();
+  //static double  time=0;
+  //double t=0;
+  //t=TimeStart();
   //256
   //avant ecb
+    for(int i=0;i<nb_test;i++)
+  {  
+
   if(ctr) {
     if(1 != EVP_EncryptInit_ex(ctx, EVP_aes_128_ctr(), NULL, key, iv))
       handleErrors();
@@ -70,8 +73,8 @@ 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();
 
-  time+=TimeStop(t);
-  printf("Time init %f\n",time);
+  //time+=TimeStop(t);
+  //printf("Time init %f\n",time);
 
   
 //  int cipherBlockSize = EVP_CIPHER_CTX_block_size(ctx);  
@@ -87,14 +90,12 @@ int encrypt(unsigned char *plaintext, int plaintext_len, unsigned char *key,
   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);
@@ -107,7 +108,7 @@ int encrypt(unsigned char *plaintext, int plaintext_len, unsigned char *key,
    */
   if(1 != EVP_EncryptFinal_ex(ctx, ciphertext + len, &len)) handleErrors();
   ciphertext_len += len;
-
+  }
   /* Clean up */
   EVP_CIPHER_CTX_free(ctx);
 
@@ -134,6 +135,9 @@ int decrypt(unsigned char *ciphertext, int ciphertext_len, unsigned char *key,
 
   //256
 
+  for(int i=0;i<nb_test;i++)
+  {  
+  
   //avant => ecb
   if(ctr) {
     if(1 != EVP_DecryptInit_ex(ctx, EVP_aes_128_ctr(), NULL, key, iv))
@@ -151,13 +155,12 @@ int decrypt(unsigned char *ciphertext, int ciphertext_len, unsigned char *key,
   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);
@@ -169,7 +172,7 @@ 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 */
@@ -275,7 +278,8 @@ int main (int argc, char** argv)
 */
 
 
-  double time=0;
+  double time_encrypt=0;
+  double time_decrypt=0;
   double t=TimeStart();
 
   
@@ -290,9 +294,10 @@ int main (int argc, char** argv)
 			      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++) {
@@ -304,7 +309,6 @@ int main (int argc, char** argv)
  }
  
   
-  time=0;
   t=0;
   t=TimeStart();
 
@@ -315,9 +319,10 @@ int main (int argc, char** argv)
 				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++) {