new

diff --git a/OneRoundIoT/openssl/openssl_evp.c b/OneRoundIoT/openssl/openssl_evp.c
index 4e99565f69b3971d91ffe0c9fede620e7be8b5ee..90441f1596ebff92ab989d527497d9df209c1adb 100644 (file)
--- a/OneRoundIoT/openssl/openssl_evp.c
+++ b/OneRoundIoT/openssl/openssl_evp.c
@@ -57,9 +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();
+  //static double  time=0;
+  //double t=0;
+  //t=TimeStart();

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


@@ -70,8 +70,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();
 
       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);  
 
   
 //  int cipherBlockSize = EVP_CIPHER_CTX_block_size(ctx);  


@@ -275,7 +275,8 @@ int main (int argc, char** argv)
 */
 
 
 */
 
 

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

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


@@ -290,9 +291,10 @@ int main (int argc, char** argv)
                              ciphertext, ctr, i );
   }
 
                              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++) {


@@ -304,7 +306,6 @@ int main (int argc, char** argv)
  }
  
   
  }
  
   

-  time=0;

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


@@ -315,9 +316,10 @@ int main (int argc, char** argv)
                                decryptedtext,ctr, i);
   }
 
                                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++) {