new

diff --git a/OneRoundIoT/OneRound/one_round_auth.cpp b/OneRoundIoT/OneRound/one_round_auth.cpp
index 9062cadddcba393eb2fb543af3f337eb86e4562b..c47f54648010c0188bfc88e99463ab403310c3c9 100644 (file)
--- a/OneRoundIoT/OneRound/one_round_auth.cpp
+++ b/OneRoundIoT/OneRound/one_round_auth.cpp
@@ -287,7 +287,6 @@ void encrypt_ctr(uchar* seq_in, uchar *seq_out, int len,uchar* RM1,uchar *RM2,in
          RM2[a+2]=Z[a+2];
          RM2[a+3]=Z[a+3];
        }
          RM2[a+2]=Z[a+2];
          RM2[a+3]=Z[a+3];
        }

-       

       }
 
     }
       }
 
     }

diff --git a/OneRoundIoT/OneRound/one_round_hash_new.cpp b/OneRoundIoT/OneRound/one_round_hash_new.cpp
index a72d301ec98184bfd327d62bb05e4bc958aa330e..03242cde27df92ac40078621593989cab7fe88d3 100644 (file)
--- a/OneRoundIoT/OneRound/one_round_hash_new.cpp
+++ b/OneRoundIoT/OneRound/one_round_hash_new.cpp
@@ -168,16 +168,7 @@ void hash_DSD_BIN(uchar* seq_in, uchar* RM1,int len, int *PboxRM, uchar *Sbox1,
       X[a+3]=RM1[a+3]^seq_in[ind2+a+3];
     }
 
       X[a+3]=RM1[a+3]^seq_in[ind2+a+3];
     }
 

-/*    Y[0]=Sbox1[X[0]^X[h-1]];
-    for(int a=1;a<h;a++) {
-      Y[a]=Sbox1[Y[a-1]^X[a-1]];
-    }

 
 

-    Z[h-1]=Sbox2[Y[h-1]^Y[0]];
-    for(int a=h-1;a>0;a--) {
-      Z[a-1]=Sbox2[Z[a]^Y[a]];
-    }
-*/

 
     Y[0]=X[0]^X[h-1];
     for(int a=1;a<h;a++) {
 
     Y[0]=X[0]^X[h-1];
     for(int a=1;a<h;a++) {


@@ -200,15 +191,6 @@ void hash_DSD_BIN(uchar* seq_in, uchar* RM1,int len, int *PboxRM, uchar *Sbox1,
       Z[a-1]=Z[a]^Y[a];
     }
 
       Z[a-1]=Z[a]^Y[a];
     }
 

-    /*  for(int a=0;a<h;a+=4) {
-      Z[a]=Sbox2[Z[a]];
-      Z[a+1]=Sbox2[Z[a+1]];
-      Z[a+2]=Sbox2[Z[a+2]];
-      Z[a+3]=Sbox2[Z[a+3]];
-
-      }*/
-
-    

     
     for(int a=0;a<h;a+=4) {
       RM1[a]=Z[a];
     
     for(int a=0;a<h;a+=4) {
       RM1[a]=Z[a];


@@ -216,12 +198,7 @@ void hash_DSD_BIN(uchar* seq_in, uchar* RM1,int len, int *PboxRM, uchar *Sbox1,
       RM1[a+2]=Z[a+2];
       RM1[a+3]=Z[a+3];
       
       RM1[a+2]=Z[a+2];
       RM1[a+3]=Z[a+3];
       

-/*
-      RM1[a]=Z[a]^RM1[PboxRM[a]];
-      RM1[a+1]=Z[a+1]^RM1[PboxRM[a+1]];
-      RM1[a+2]=Z[a+2]^RM1[PboxRM[a+2]];
-      RM1[a+3]=Z[a+3]^RM1[PboxRM[a+3]];
-*/    
+

     }
     
   }
     }
     
   }

diff --git a/OneRoundIoT/openssl/openssl_evp_gcm.c b/OneRoundIoT/openssl/openssl_evp_gcm.c
index 889d9f5b10814b61ccb00bc98140b44b18c60f01..b49a51c24c68f34db1caf1e3481731747acd5d5b 100644 (file)
--- a/OneRoundIoT/openssl/openssl_evp_gcm.c
+++ b/OneRoundIoT/openssl/openssl_evp_gcm.c
@@ -149,7 +149,7 @@ int decryptgcm(unsigned char *ciphertext, int ciphertext_len, unsigned char *aad
           * anything else is a failure - the plaintext is not trustworthy.
           */
          ret = EVP_DecryptFinal_ex(ctx, plaintext + len, &len);
           * anything else is a failure - the plaintext is not trustworthy.
           */
          ret = EVP_DecryptFinal_ex(ctx, plaintext + len, &len);

-CPU    }
+       }

 
          
        /* Clean up */
 
          
        /* Clean up */