update makefile

[Cipher_code.git] / LightweightARM / LWARM / lwarm.cpp

diff --git a/LightweightARM/LWARM/lwarm.cpp b/LightweightARM/LWARM/lwarm.cpp
index 8bb9da48db812252fafde7e02252c26410412549..13d8bba792f6ca09944a42e5533a4991015e18a7 100644 (file)
--- a/LightweightARM/LWARM/lwarm.cpp
+++ b/LightweightARM/LWARM/lwarm.cpp
@@ -75,7 +75,6 @@ void inverse_tables_int(int *tab, int size_tab,int *inv_perm_tabs) {
   for(int i=0;i<size_tab;i++) {
     inv_perm_tabs[tab[i]] = i;
   }
   for(int i=0;i<size_tab;i++) {
     inv_perm_tabs[tab[i]] = i;
   }

-

 }
 
 
 }
 
 


@@ -418,7 +417,7 @@ void KeyExpansion(uchar *RoundKey, uchar *key, int NN )
     }
 
   // All other round keys are found from the previous round keys.
     }
 
   // All other round keys are found from the previous round keys.

-  while (i < 160)
+  while (i < 256)

     {
       for(j=0;j<4;j++)
        {
     {
       for(j=0;j<4;j++)
        {


@@ -710,7 +709,10 @@ int main(int argc, char** argv) {
 
   int NN=128;
 
 
   int NN=128;
 

-  unsigned char RoundKey[240];
+  unsigned char RoundKey[256];
+  for(int i=0;i<256;i++) {
+    RoundKey[i]=0;
+  }

   
   for(int i=1; i<argc; i++){
     if(strncmp(argv[i],"nb",2)==0)    nb_test = atoi(&(argv[i][2]));    //nb of test         
   
   for(int i=1; i<argc; i++){
     if(strncmp(argv[i],"nb",2)==0)    nb_test = atoi(&(argv[i][2]));    //nb of test         


@@ -765,24 +767,21 @@ int main(int argc, char** argv) {
   KeyExpansion(RoundKey, enc_key, NN);
 
 
   KeyExpansion(RoundKey, enc_key, NN);
 
 

-  for (size_t i=0; i<240/16; ++i) {
-    for(int j=0; j<16; j++) {
-    cout<<(int)RoundKey[i*16+j]<<" ";
-    }
-      cout<<endl;
+  for (size_t i=0; i<256/16; ++i) {
+    rdkeys[i] = vld1q_u8(&RoundKey[i*16]);
+    print128_num(rdkeys[i]);

   }
 
 
   }
 
 

-  exit(0);

   
   
   
   

-  cout<<"start of useless computation"<<endl;
+  /*  cout<<"start of useless computation"<<endl;

   double dummy=0;
   double dummy=0;

-  for(int i=0;i<20000000;i++) {
+  for(int i=0;i<40000000;i++) {

     dummy+=0.000000001*log(i+10);
   }
   cout<<"end of useless computation"<<dummy<<endl;
     dummy+=0.000000001*log(i+10);
   }
   cout<<"end of useless computation"<<dummy<<endl;

-  
+  */

   
   int size = 64;
   uchar DK[size];
   
   int size = 64;
   uchar DK[size];