update

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

diff --git a/OneRoundIoT/openssl/openssl_evp.c b/OneRoundIoT/openssl/openssl_evp.c
index fd4dd257db1a26a750669f3ce6c179a0a6fcbfce..90441f1596ebff92ab989d527497d9df209c1adb 100644 (file)
--- a/OneRoundIoT/openssl/openssl_evp.c
+++ b/OneRoundIoT/openssl/openssl_evp.c
@@ -57,7 +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();

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


@@ -68,6 +70,10 @@ 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);
+
+  

 //  int cipherBlockSize = EVP_CIPHER_CTX_block_size(ctx);  
 //  printf("INFO(evp_encrypt): block size: %d\n", cipherBlockSize);
 
 //  int cipherBlockSize = EVP_CIPHER_CTX_block_size(ctx);  
 //  printf("INFO(evp_encrypt): block size: %d\n", cipherBlockSize);
 


@@ -84,8 +90,7 @@ int encrypt(unsigned char *plaintext, int plaintext_len, unsigned char *key,
   for(int i=0;i<nb_test;i++)
   {  
   
   for(int i=0;i<nb_test;i++)
   {  
   

-    ciphertext_len = 0;
-    if(1 != EVP_EncryptUpdate(ctx, ciphertext, &len, plaintext, plaintext_len))
+      if(1 != EVP_EncryptUpdate(ctx, ciphertext, &len, plaintext, plaintext_len))

       handleErrors();
     ciphertext_len = len;
     
       handleErrors();
     ciphertext_len = len;
     


@@ -227,7 +232,8 @@ int main (int argc, char** argv)
 //  load_RGB_pixmap("No_ecb_mode_picture.ppm", &width, &height, &data_R, &data_G, &data_B);
   }
   else {
 //  load_RGB_pixmap("No_ecb_mode_picture.ppm", &width, &height, &data_R, &data_G, &data_B);
   }
   else {

-    width=height=size_buf;
+    width=size_buf;
+    height=size_buf;

     imsize=width*height;
     buffer=malloc(imsize*sizeof(uchar));
     for(int i=0;i<imsize;i++) {
     imsize=width*height;
     buffer=malloc(imsize*sizeof(uchar));
     for(int i=0;i<imsize;i++) {


@@ -238,7 +244,7 @@ int main (int argc, char** argv)
 
 
   int oneD=width*height;
 
 
   int oneD=width*height;

-  uchar *plaintext = malloc(imsize);
+  uchar *plaintext = malloc(imsize+1000);   //add that for cbc

   if(lena) {
     for(int i=0;i<oneD;i++) {
       plaintext[i]=data_R[i];
   if(lena) {
     for(int i=0;i<oneD;i++) {
       plaintext[i]=data_R[i];


@@ -255,10 +261,10 @@ int main (int argc, char** argv)
 
   
 
 
   
 

-  uchar *ciphertext = malloc(imsize);
+  uchar *ciphertext = malloc(imsize+1000); //add that for cbc

 
   /* Buffer for the decrypted text */
 
   /* Buffer for the decrypted text */

-  uchar *decryptedtext = malloc(imsize);
+  uchar *decryptedtext = malloc(imsize+1000); //add that for cbc

 
   int decryptedtext_len, ciphertext_len;
 
 
   int decryptedtext_len, ciphertext_len;
 


@@ -269,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();
 
   


@@ -284,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++) {


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

-  time=0;

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


@@ -309,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++) {