X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/Cipher_code.git/blobdiff_plain/8ba8fb459047af4b6fcad29ecb87a2b40ab0146e..690cdccf517efa042aaec349f292a9238d56473c:/OneRoundIoT/openssl/openssl_evp.c?ds=sidebyside

diff --git a/OneRoundIoT/openssl/openssl_evp.c b/OneRoundIoT/openssl/openssl_evp.c
index 90441f1..0a4b949 100644
--- a/OneRoundIoT/openssl/openssl_evp.c
+++ b/OneRoundIoT/openssl/openssl_evp.c
@@ -16,6 +16,9 @@ typedef unsigned char   uchar;
 int nb_test=1;
 int ctr=0;
 
+double time_encrypt=0;
+double time_decrypt=0;
+
 double TimeStart()
 {
   struct timeval tstart;
@@ -49,6 +52,9 @@ int encrypt(unsigned char *plaintext, int plaintext_len, unsigned char *key,
 
   int ciphertext_len;
 
+
+
+  
   /* Create and initialise the context */
   if(!(ctx = EVP_CIPHER_CTX_new())) handleErrors();
 
@@ -57,57 +63,47 @@ 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();
+
+  double t=TimeStart();
+  
   //256
   //avant ecb
-  if(ctr) {
-    if(1 != EVP_EncryptInit_ex(ctx, EVP_aes_128_ctr(), NULL, key, iv))
-      handleErrors();
-  }
-  else
+  for(int i=0;i<nb_test;i++)
+  {  
+    
+    if(ctr) {
+      if(1 != EVP_EncryptInit_ex(ctx, EVP_aes_128_ctr(), NULL, key, iv))
+	handleErrors();
+    }
+    else
       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);  
 //  printf("INFO(evp_encrypt): block size: %d\n", cipherBlockSize);
-
-  
-  /* Provide the message to be encrypted, and obtain the encrypted output.
-   * 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++)
-  {  
-  
-      if(1 != EVP_EncryptUpdate(ctx, ciphertext, &len, plaintext, plaintext_len))
+    
+    
+    /* Provide the message to be encrypted, and obtain the encrypted output.
+     * EVP_EncryptUpdate can be called multiple times if necessary
+     */
+    
+    if(1 != EVP_EncryptUpdate(ctx, ciphertext, &len, plaintext, plaintext_len))
       handleErrors();
     ciphertext_len = len;
     
+    /* Finalise the encryption. Further ciphertext bytes may be written at
+     * this stage.
+     */
+    if(1 != EVP_EncryptFinal_ex(ctx, ciphertext + len, &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
-   * this stage.
-   */
-  if(1 != EVP_EncryptFinal_ex(ctx, ciphertext + len, &len)) handleErrors();
-  ciphertext_len += len;
-
+  time_encrypt+=TimeStop(t);
+  
   /* Clean up */
   EVP_CIPHER_CTX_free(ctx);
 
@@ -134,6 +130,11 @@ int decrypt(unsigned char *ciphertext, int ciphertext_len, unsigned char *key,
 
   //256
 
+  double t=TimeStart();
+  
+  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 +152,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,8 +169,10 @@ int decrypt(unsigned char *ciphertext, int ciphertext_len, unsigned char *key,
    */
   if(1 != EVP_DecryptFinal_ex(ctx, plaintext + len, &len)) handleErrors();
   plaintext_len += len;
+  }
 
-  
+
+  time_decrypt+=TimeStop(t);
   
   /* Clean up */
   EVP_CIPHER_CTX_free(ctx);
@@ -275,9 +277,8 @@ int main (int argc, char** argv)
 */
 
 
-  double time_encrypt=0;
-  double time_decrypt=0;
-  double t=TimeStart();
+
+
 
   
   /* Encrypt the plaintext */
@@ -291,10 +292,10 @@ int main (int argc, char** argv)
 			      ciphertext, ctr, i );
   }
 
- time_encrypt+=TimeStop(t);
+
 
 // printf("Time encrypt %f\n",time);
- printf("%f\t",(double)imsize*nb_test/time_encrypt);
+ printf("%e\t",(double)imsize*nb_test/time_encrypt);
 
  if(lena) {
    for(int i=0;i<oneD;i++) {
@@ -306,9 +307,6 @@ int main (int argc, char** argv)
  }
  
   
-  t=0;
-  t=TimeStart();
-
   //for(int i=0;i<nb_test;i++)
   {  
     /* Decrypt the ciphertext */
@@ -316,10 +314,8 @@ int main (int argc, char** argv)
 				decryptedtext,ctr, i);
   }
 
- time_decrypt+=TimeStop(t);
-
  //printf("Time decrypt %f\n",time);
- printf("%f\t",(double)imsize*nb_test/time_decrypt);
+ printf("%e\t",(double)imsize*nb_test/time_decrypt);
 
  if(lena) {
    for(int i=0;i<oneD;i++) {