new

diff --git a/OneRoundIoT/OneRound/one_round_new.cpp b/OneRoundIoT/OneRound/one_round_new.cpp
index 95c602ede9c608f20834db93cc54f4387d7f6aa5..a22285512c213b6b8d0bcf4cddd0d1f4186432a7 100644 (file)
--- a/OneRoundIoT/OneRound/one_round_new.cpp
+++ b/OneRoundIoT/OneRound/one_round_new.cpp
@@ -27,7 +27,7 @@ using namespace std;
 
 
 int key_size=256;
 
 
 int key_size=256;

-
+int nb_test=1;

 
 const int h=16;
 const int h2=h*h;
 
 const int h=16;
 const int h2=h*h;


@@ -308,7 +308,7 @@ void Dynamickeygenerationnew(uchar *Secretkey, uchar *counter) {
   for (int i = 48; i < 64; i++)
     keyp[i-48] = DK[i];
 
   for (int i = 48; i < 64; i++)
     keyp[i-48] = DK[i];
 

-  cout<<len<<endl;
+//  cout<<len<<endl;

   int *Pbox=new int[len];
   int *PboxRM=new int[h2];
 
   int *Pbox=new int[len];
   int *PboxRM=new int[h2];
 


@@ -316,7 +316,7 @@ void Dynamickeygenerationnew(uchar *Secretkey, uchar *counter) {
 
   printf("len %d\n",len);
   for(int i=0;i<len;i++) {
 
   printf("len %d\n",len);
   for(int i=0;i<len;i++) {

-    printf("%d \n",Pbox[i]);
+//    printf("%d \n",Pbox[i]);

   }
   
   rc4keyperm(RM2, h2, rp, PboxRM, h2);
   }
   
   rc4keyperm(RM2, h2, rp, PboxRM, h2);


@@ -330,7 +330,7 @@ void Dynamickeygenerationnew(uchar *Secretkey, uchar *counter) {
   double t=TimeStart();
 
   int i;
   double t=TimeStart();
 
   int i;

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

   {
     encrypt(seq, seq2,len,RM1,Pbox,PboxRM,Sbox1,Sbox2,0);
   }
   {
     encrypt(seq, seq2,len,RM1,Pbox,PboxRM,Sbox1,Sbox2,0);
   }


@@ -349,7 +349,7 @@ void Dynamickeygenerationnew(uchar *Secretkey, uchar *counter) {
 
   time=0;
   t=TimeStart();
 
   time=0;
   t=TimeStart();

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

     decrypt(seq2,seq,len,RM2,Pbox,PboxRM,Sbox1,Sbox2,0);
   }
 
     decrypt(seq2,seq,len,RM2,Pbox,PboxRM,Sbox1,Sbox2,0);
   }
 


@@ -372,12 +372,20 @@ void Dynamickeygenerationnew(uchar *Secretkey, uchar *counter) {
 
 
 
 
 
 

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

   cout << "Hello, World!" << endl;
 
 
  
 
   cout << "Hello, World!" << endl;
 
 
  
 

+  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);

 
   int seed=time(NULL);
   cout<<seed<<endl;
 
   int seed=time(NULL);
   cout<<seed<<endl;