new

diff --git a/OneRoundIoT/openssl/openssl_evp_ccm.c b/OneRoundIoT/openssl/openssl_evp_ccm.c
index 74549f81568d2a0f4c4287ba634d713b989c52d8..ad5324de1706a71c88402b3c842409ce17b0b134 100644 (file)
--- a/OneRoundIoT/openssl/openssl_evp_ccm.c
+++ b/OneRoundIoT/openssl/openssl_evp_ccm.c
@@ -129,18 +129,10 @@ int decryptccm(unsigned char *ciphertext, int ciphertext_len, unsigned char *aad
        if(1 != EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_IVLEN, 7, NULL))
                handleErrors();
 
        if(1 != EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_IVLEN, 7, NULL))
                handleErrors();
 

- for(int i=0;i<16;i++) {
-    printf("%d ",tag[i]);
-  }
-  printf("\n");
-       

        /* Set expected tag value. */
        if(1 != EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_TAG, 16, tag))
                handleErrors();
        /* Set expected tag value. */
        if(1 != EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_TAG, 16, tag))
                handleErrors();

- for(int i=0;i<16;i++) {
-    printf("%d ",tag[i]);
-  }
-  printf("\n");
+

        /* Initialise key and IV */
        if(1 != EVP_DecryptInit_ex(ctx, NULL, NULL, key, iv)) handleErrors();
 
        /* Initialise key and IV */
        if(1 != EVP_DecryptInit_ex(ctx, NULL, NULL, key, iv)) handleErrors();
 


@@ -161,7 +153,7 @@ int decryptccm(unsigned char *ciphertext, int ciphertext_len, unsigned char *aad
         */
        ret = EVP_DecryptUpdate(ctx, plaintext, &len, ciphertext, ciphertext_len);
 
         */
        ret = EVP_DecryptUpdate(ctx, plaintext, &len, ciphertext, ciphertext_len);
 

-       printf("RET %d len %d\n",ret,len);
+       //      printf("RET %d len %d\n",ret,len);

        
        plaintext_len = len;
 
        
        plaintext_len = len;
 


@@ -434,23 +426,23 @@ int main (int argc, char** argv)
 
 
 
 
 
 

-  for(int i=0;i<16;i++)
+  /*  for(int i=0;i<16;i++)

     printf("%d ",tag[i]);
   printf("\n");
     printf("%d ",tag[i]);
   printf("\n");

-  
-//  for(i=0;i<nb_test;i++)
+  */
+ for(i=0;i<nb_test;i++)

   {  
     ciphertext_len = encryptccm (plaintext, imsize, plaintext, imsize, key, iv,
                              ciphertext, tag);
   }
   {  
     ciphertext_len = encryptccm (plaintext, imsize, plaintext, imsize, key, iv,
                              ciphertext, tag);
   }

-  for(int i=0;i<16;i++) {
+  /*for(int i=0;i<16;i++) {

     printf("%d ",tag[i]);
   }
     printf("%d ",tag[i]);
   }

-  printf("\n");
+  printf("\n");*/

  time_encrypt+=TimeStop(t);
 
 // printf("Time encrypt %f\n",time);
  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++) {
 
  if(lena) {
    for(int i=0;i<oneD;i++) {


@@ -467,7 +459,7 @@ int main (int argc, char** argv)
 
 
   
 
 
   

-  //for(int i=0;i<nb_test;i++)
+  for(int i=0;i<nb_test;i++)

   {  
     /* Decrypt the ciphertext */
     decryptedtext_len = decryptccm(ciphertext, ciphertext_len,ciphertext, ciphertext_len,tag,  key, iv,
   {  
     /* Decrypt the ciphertext */
     decryptedtext_len = decryptccm(ciphertext, ciphertext_len,ciphertext, ciphertext_len,tag,  key, iv,


@@ -477,7 +469,7 @@ int main (int argc, char** argv)
  time_decrypt+=TimeStop(t);
 
  //printf("Time decrypt %f\n",time);
  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++) {
 
  if(lena) {
    for(int i=0;i<oneD;i++) {

diff --git a/OneRoundIoT/openssl/openssl_evp_gcm.c b/OneRoundIoT/openssl/openssl_evp_gcm.c
index b49a51c24c68f34db1caf1e3481731747acd5d5b..54a998f51b224d6f1791138516d0bfe19e76e9df 100644 (file)
--- a/OneRoundIoT/openssl/openssl_evp_gcm.c
+++ b/OneRoundIoT/openssl/openssl_evp_gcm.c
@@ -435,7 +435,7 @@ int main (int argc, char** argv)
  time_encrypt+=TimeStop(t);
 
 // printf("Time encrypt %f\n",time);
  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++) {
 
  if(lena) {
    for(int i=0;i<oneD;i++) {


@@ -462,7 +462,7 @@ int main (int argc, char** argv)
  time_decrypt+=TimeStop(t);
 
  //printf("Time decrypt %f\n",time);
  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++) {
 
  if(lena) {
    for(int i=0;i<oneD;i++) {