new

[Cipher_code.git] / OneRoundIoT / EnhancedOneRound / enhanced_oneround.cpp

diff --git a/OneRoundIoT/EnhancedOneRound/enhanced_oneround.cpp b/OneRoundIoT/EnhancedOneRound/enhanced_oneround.cpp
index 751c07180c80e6990daa6c75d2b1bc110ad17511..5842b5fa50d94232308c8ddb148cd733ac9ee3b9 100644 (file)
--- a/OneRoundIoT/EnhancedOneRound/enhanced_oneround.cpp
+++ b/OneRoundIoT/EnhancedOneRound/enhanced_oneround.cpp
@@ -38,7 +38,7 @@ int ecbprng=0;
 
 
 
 
 
 

-
+typedef __uint64_t ulong;

 
 
 typedef unsigned char   uchar;
 
 
 typedef unsigned char   uchar;


@@ -197,11 +197,13 @@ void encrypt_ecb_prng(uchar* seq_in, uchar *seq_out, int len,uchar* RM, int *Pbo
   uchar Y[h];
   uchar fX[h];
   uchar gY[h];
   uchar Y[h];
   uchar fX[h];
   uchar gY[h];

-  uchar RM1[h];
-  uchar RM2[h];
+  uchar *RM1=&RM[0];
+  uchar *RM2=&RM[h];

   uchar tmp[h];
   ulong *rm1=(ulong*)RM1;
   ulong *rm2=(ulong*)RM2;
   uchar tmp[h];
   ulong *rm1=(ulong*)RM1;
   ulong *rm2=(ulong*)RM2;

+
+  

   
   for(int it=0;it<len/2;it++) {
     int ind1=Pbox[it]*h;
   
   for(int it=0;it<len/2;it++) {
     int ind1=Pbox[it]*h;


@@ -328,6 +330,7 @@ void decrypt_ecb_prng(uchar* seq_in, uchar *seq_out, int len, uchar* RM, int *Pb
   uchar tmp[h];
   ulong *rm1=(ulong*)RM1;
   ulong *rm2=(ulong*)RM2;
   uchar tmp[h];
   ulong *rm1=(ulong*)RM1;
   ulong *rm2=(ulong*)RM2;

+

   
   for(int it=0;it<len/2;it++) {
     int ind1=Pbox[it]*h;
   
   for(int it=0;it<len/2;it++) {
     int ind1=Pbox[it]*h;


@@ -862,11 +865,14 @@ void encrypt_cbc_prng(uchar* seq_in, uchar *seq_out, int len,uchar* RM, int *Pbo
   uchar gY[h];
   uchar IV1[h];
   uchar IV2[h];
   uchar gY[h];
   uchar IV1[h];
   uchar IV2[h];

-  uchar RM1[h];
-  uchar RM2[h];
+  uchar *RM1=&RM[0];
+  uchar *RM2=&RM[h];

   uchar tmp[h];
   ulong *rm1=(ulong*)RM1;
   ulong *rm2=(ulong*)RM2;
   uchar tmp[h];
   ulong *rm1=(ulong*)RM1;
   ulong *rm2=(ulong*)RM2;

+
+
+

   
   for(int it=0;it<len/2;it++) {
     int ind1=Pbox[it]*h;
   
   for(int it=0;it<len/2;it++) {
     int ind1=Pbox[it]*h;


@@ -1031,8 +1037,10 @@ void decrypt_cbc_prng(uchar* seq_in, uchar *seq_out, int len, uchar* RM, int *Pb
   uchar gY[h];
   uchar IV1[h];
   uchar IV2[h];
   uchar gY[h];
   uchar IV1[h];
   uchar IV2[h];

-  uchar RM1[h];
-  uchar RM2[h];
+  uchar *RM1=&RM[0];
+  uchar *RM2=&RM[h];
+//  uchar RM1[h];
+//  uchar RM2[h];

   uchar tmp[h];
   ulong *rm1=(ulong*)RM1;
   ulong *rm2=(ulong*)RM2;
   uchar tmp[h];
   ulong *rm1=(ulong*)RM1;
   ulong *rm2=(ulong*)RM2;


@@ -2194,6 +2202,5 @@ int main(int argc, char** argv) {
   }
   
 
   }
   
 

-

   return 0;
 }
   return 0;
 }