new

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

diff --git a/OneRoundIoT/openssl/openssl_evp_ebc.c b/OneRoundIoT/openssl/openssl_evp_ebc.c
index c7b2425c1b373c05e93e0fb47520b9bcc9679fd5..e4fea7432fec9c2427c9bf626bf482dba379cb25 100644 (file)
--- a/OneRoundIoT/openssl/openssl_evp_ebc.c
+++ b/OneRoundIoT/openssl/openssl_evp_ebc.c
@@ -137,7 +137,7 @@ int decrypt(unsigned char *ciphertext, int ciphertext_len, unsigned char *key,
 }
 
 
 }
 
 

-int main (void)
+int main (int argc, char** argv)

 {
   /* Set up the key and iv. Do I need to say to not hard code these in a
    * real application? :-)
 {
   /* Set up the key and iv. Do I need to say to not hard code these in a
    * real application? :-)


@@ -152,7 +152,15 @@ int main (void)
 
   /* Message to be encrypted */
 
 
   /* Message to be encrypted */
 

-
+ int nb_test=1;
+  if(argc==2)
+    nb_test=atoi(argv[1]);
+  if(nb_test<=0 || nb_test>10000) {
+    printf("nb tests is not correct\n");
+    exit(0);
+  }
+  else
+    printf("nb tests = %d\n\n",nb_test);

 
 
   
 
 
   


@@ -164,11 +172,11 @@ int main (void)
   int width;
   int height;
   uchar *data_R, *data_G, *data_B;
   int width;
   int height;
   uchar *data_R, *data_G, *data_B;

-//  load_RGB_pixmap("lena.ppm", &width, &height, &data_R, &data_G, &data_B);
+  load_RGB_pixmap("lena.ppm", &width, &height, &data_R, &data_G, &data_B);

 
 
 //  load_RGB_pixmap("No_ecb_mode_picture.ppm", &width, &height, &data_R, &data_G, &data_B);
 
 
 //  load_RGB_pixmap("No_ecb_mode_picture.ppm", &width, &height, &data_R, &data_G, &data_B);

-  load_RGB_pixmap("4096.ppm", &width, &height, &data_R, &data_G, &data_B);
+//  load_RGB_pixmap("4096.ppm", &width, &height, &data_R, &data_G, &data_B);

   int size=width*height*3;
 
   int oneD=width*height;
   int size=width*height*3;
 
   int oneD=width*height;


@@ -190,11 +198,7 @@ int main (void)
 
   int decryptedtext_len, ciphertext_len;
 
 
   int decryptedtext_len, ciphertext_len;
 

-  /* Initialise the library */
-  ERR_load_crypto_strings();
-  OpenSSL_add_all_algorithms();
-  OPENSSL_config(NULL);
-
+ 

   int ss=0;
    double time=0;
   double t=TimeStart();
   int ss=0;
    double time=0;
   double t=TimeStart();


@@ -205,16 +209,15 @@ int main (void)
 
   int i;
 
 
   int i;
 

-  for(i=0;i<100;i++)
+  for(i=0;i<nb_test;i++)

   {  
     ciphertext_len = encrypt (plaintext, size, key, iv,
                              ciphertext);
   {  
     ciphertext_len = encrypt (plaintext, size, key, iv,
                              ciphertext);

-    ss+=ciphertext[100];

   }
   }

-
+  

  time+=TimeStop(t);
 
  time+=TimeStop(t);
 

- printf("Time encrypt %f   ss %d\n",time,ss);
+ printf("Time encrypt %f \n",time);

 
 
  for(int i=0;i<oneD;i++) {
 
 
  for(int i=0;i<oneD;i++) {


@@ -229,7 +232,7 @@ int main (void)
   t=0;
   t=TimeStart();
 
   t=0;
   t=TimeStart();
 

-  for(int i=0;i<100;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,