new

diff --git a/OneRoundIoT/EnhancedOneRound/enhanced_oneround.cpp b/OneRoundIoT/EnhancedOneRound/enhanced_oneround.cpp
index 5842b5fa50d94232308c8ddb148cd733ac9ee3b9..1b2980cbdc38bd1a0c5a98ee5fac3a5121fe7efa 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 __uint64_t mylong;

 
 
 typedef unsigned char   uchar;
 
 
 typedef unsigned char   uchar;


@@ -74,12 +74,12 @@ uint xorshift32(const uint t)
 }
 
 
 }
 
 

-ulong xorseed;
+mylong xorseed;

 
 

-ulong xorshift64()
+mylong xorshift64()

 {
         /* Algorithm "xor" from p. 4 of Marsaglia, "Xorshift RNGs" */
 {
         /* Algorithm "xor" from p. 4 of Marsaglia, "Xorshift RNGs" */

-        ulong x = xorseed;
+        mylong x = xorseed;

         x ^= x >> 12; // a
         x ^= x << 25; // b
         x ^= x >> 27; // c
         x ^= x >> 12; // a
         x ^= x << 25; // b
         x ^= x >> 27; // c


@@ -191,7 +191,7 @@ void prga(uchar *sc, int ldata, uchar *r) {
 
 
 template<int h>
 
 
 template<int h>

-void encrypt_ecb_prng(uchar* seq_in, uchar *seq_out, int len,uchar* RM, int *Pbox, int *PboxSRM, uchar *Sbox1, uchar *Sbox2, ulong myrand, int debug) {
+void encrypt_ecb_prng(uchar* seq_in, uchar *seq_out, int len,uchar* RM, int *Pbox, int *PboxSRM, uchar *Sbox1, uchar *Sbox2, mylong myrand, int debug) {

 
   uchar X[h];
   uchar Y[h];
 
   uchar X[h];
   uchar Y[h];


@@ -200,8 +200,8 @@ void encrypt_ecb_prng(uchar* seq_in, uchar *seq_out, int len,uchar* RM, int *Pbo
   uchar *RM1=&RM[0];
   uchar *RM2=&RM[h];
   uchar tmp[h];
   uchar *RM1=&RM[0];
   uchar *RM2=&RM[h];
   uchar tmp[h];

-  ulong *rm1=(ulong*)RM1;
-  ulong *rm2=(ulong*)RM2;
+  mylong *rm1=(mylong*)RM1;
+  mylong *rm2=(mylong*)RM2;

 
   
   
 
   
   


@@ -319,7 +319,7 @@ void encrypt_ecb_prng(uchar* seq_in, uchar *seq_out, int len,uchar* RM, int *Pbo
 
 
 template<int h>
 
 
 template<int h>

-void decrypt_ecb_prng(uchar* seq_in, uchar *seq_out, int len, uchar* RM, int *Pbox, int *PboxSRM, uchar *Sbox1, uchar *Sbox2, uchar *Inv_Sbox1, uchar *Inv_Sbox2,  ulong myrand, int debug) {
+void decrypt_ecb_prng(uchar* seq_in, uchar *seq_out, int len, uchar* RM, int *Pbox, int *PboxSRM, uchar *Sbox1, uchar *Sbox2, uchar *Inv_Sbox1, uchar *Inv_Sbox2,  mylong myrand, int debug) {

 
   uchar invfX[h];
   uchar invgY[h];
 
   uchar invfX[h];
   uchar invgY[h];


@@ -328,8 +328,8 @@ void decrypt_ecb_prng(uchar* seq_in, uchar *seq_out, int len, uchar* RM, int *Pb
   uchar RM1[h];
   uchar RM2[h];
   uchar tmp[h];
   uchar RM1[h];
   uchar RM2[h];
   uchar tmp[h];

-  ulong *rm1=(ulong*)RM1;
-  ulong *rm2=(ulong*)RM2;
+  mylong *rm1=(mylong*)RM1;
+  mylong *rm2=(mylong*)RM2;

 
   
   for(int it=0;it<len/2;it++) {
 
   
   for(int it=0;it<len/2;it++) {


@@ -446,7 +446,7 @@ void decrypt_ecb_prng(uchar* seq_in, uchar *seq_out, int len, uchar* RM, int *Pb
 
 
 template<int h>
 
 
 template<int h>

-void encrypt_ecb_rm(uchar* seq_in, uchar *seq_out, int len,uchar* RM, int *Pbox, int *PboxSRM, uchar *Sbox1, uchar *Sbox2, ulong myrand, int debug) {
+void encrypt_ecb_rm(uchar* seq_in, uchar *seq_out, int len,uchar* RM, int *Pbox, int *PboxSRM, uchar *Sbox1, uchar *Sbox2, mylong myrand, int debug) {

 
   uchar X[h];
   uchar Y[h];
 
   uchar X[h];
   uchar Y[h];


@@ -455,8 +455,8 @@ void encrypt_ecb_rm(uchar* seq_in, uchar *seq_out, int len,uchar* RM, int *Pbox,
   uchar RM1[h];
   uchar RM2[h];
   uchar tmp[h];
   uchar RM1[h];
   uchar RM2[h];
   uchar tmp[h];

-  ulong *rm1=(ulong*)RM1;
-  ulong *rm2=(ulong*)RM2;
+  mylong *rm1=(mylong*)RM1;
+  mylong *rm2=(mylong*)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;


@@ -572,7 +572,7 @@ void encrypt_ecb_rm(uchar* seq_in, uchar *seq_out, int len,uchar* RM, int *Pbox,
 
 
 template<int h>
 
 
 template<int h>

-void decrypt_ecb_rm(uchar* seq_in, uchar *seq_out, int len, uchar* RM, int *Pbox, int *PboxSRM, uchar *Sbox1, uchar *Sbox2, uchar *Inv_Sbox1, uchar *Inv_Sbox2,  ulong myrand, int debug) {
+void decrypt_ecb_rm(uchar* seq_in, uchar *seq_out, int len, uchar* RM, int *Pbox, int *PboxSRM, uchar *Sbox1, uchar *Sbox2, uchar *Inv_Sbox1, uchar *Inv_Sbox2,  mylong myrand, int debug) {

 
   uchar invfX[h];
   uchar invgY[h];
 
   uchar invfX[h];
   uchar invgY[h];


@@ -581,8 +581,8 @@ void decrypt_ecb_rm(uchar* seq_in, uchar *seq_out, int len, uchar* RM, int *Pbox
   uchar RM1[h];
   uchar RM2[h];
   uchar tmp[h];
   uchar RM1[h];
   uchar RM2[h];
   uchar tmp[h];

-  ulong *rm1=(ulong*)RM1;
-  ulong *rm2=(ulong*)RM2;
+  mylong *rm1=(mylong*)RM1;
+  mylong *rm2=(mylong*)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;


@@ -868,8 +868,8 @@ void encrypt_cbc_prng(uchar* seq_in, uchar *seq_out, int len,uchar* RM, int *Pbo
   uchar *RM1=&RM[0];
   uchar *RM2=&RM[h];
   uchar tmp[h];
   uchar *RM1=&RM[0];
   uchar *RM2=&RM[h];
   uchar tmp[h];

-  ulong *rm1=(ulong*)RM1;
-  ulong *rm2=(ulong*)RM2;
+  mylong *rm1=(mylong*)RM1;
+  mylong *rm2=(mylong*)RM2;

 
 
 
 
 
 


@@ -1042,8 +1042,8 @@ void decrypt_cbc_prng(uchar* seq_in, uchar *seq_out, int len, uchar* RM, int *Pb
 //  uchar RM1[h];
 //  uchar RM2[h];
   uchar tmp[h];
 //  uchar RM1[h];
 //  uchar RM2[h];
   uchar tmp[h];

-  ulong *rm1=(ulong*)RM1;
-  ulong *rm2=(ulong*)RM2;
+  mylong *rm1=(mylong*)RM1;
+  mylong *rm2=(mylong*)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;


@@ -1910,7 +1910,7 @@ int main(int argc, char** argv) {
   uchar RM[h*h*2+256];
   uchar IV[2*h];
 
   uchar RM[h*h*2+256];
   uchar IV[2*h];
 

-  ulong myrand=0;
+  mylong myrand=0;

 
 
   double time_encrypt=0;
 
 
   double time_encrypt=0;