test

ecole.c

@@ -37,9 +37,9 @@ static const unsigned long long int normal[17] = {
 
 unsigned int gf[O], fg[O];
 
-uint32_t pdiv(uint32_t a, uint32_t b)
+uint64_t pdiv(uint64_t a, uint64_t b)
 {
-  uint32_t c = 0,d=a;
+  uint64_t c = 0,d=a;
 
   //printf("%b,%b\n", a, b);
   // while(b>0)
@@ -81,9 +81,9 @@ uint32_t pdiv(uint32_t a, uint32_t b)
   return a&0xff;
 }
 
-uint32_t pd(uint32_t a, uint32_t b,uint32_t d)
+uint64_t pd(uint64_t a, uint64_t b,uint64_t d)
 {
-  uint32_t c = 0,hbs=0,ll=(1<<(E-1)), l=d^(1<<E);
+  uint64_t c = 0,hbs=0,ll=(1<<(E-1)), l=d^(1<<E);
 
   while (a != 0)
   {
@@ -118,7 +118,7 @@ uint64_t seki(uint64_t a, uint64_t b)
   return c;
 }
 
-uint32_t pmod(uint32_t a, uint32_t b, uint32_t c)
+uint64_t pmod(uint64_t a, uint64_t b, uint64_t c)
 {
 
   //printf("vv %b %b %b\n",seki(a,b),c,pdiv(seki(a,b),c));
@@ -335,22 +335,22 @@ void t_box()
   gf[0] = 0;
   for (i = 1; i < O; i++)
   {
-    gf[i]=gmult(gmult(i,i),i); //pmod(pmod(i,i,normal[E]),i,normal[E]);
+    gf[i]=pd(seki(seki(seki(i,i),seki(i,i)),seki(i,i)),i,normal[E]); //pmod(pmod(i,i,normal[E]),i,normal[E]);
   }
 
   //exit(1);
   printf("static const unsigned short gf[256]={\n");
   for (i = 0; i < O; i++)
   {
-    //fg[gf[i]]=i;
+    fg[gf[i]]=i;
     printf("%3d,", gf[i]);
   }
   printf("};\n");
   printf("\n");
   printf("static const unsigned short fg[256]={\n");
   for (i = 0; i < O; i++)
   {
-    //printf("%3d,", fg[i]);
+    printf("%3d,", fg[i]);
   }
   printf("};\n");
   printf("\n");
@@ -366,8 +366,8 @@ int main()
   //printf("%b %b\n", pd(6912, 0b10, normal[13])); //pmod(0b100000000,0b10,0b100011011));
   //exit(1);
 
-  make();
-  //t_box();
+  //make();
+  t_box();
   printf("%d %d\n",gmult(seki(9,9),9),gmult(seki(34,34),34));
   exit(1);
 

vAl.c

@@ -734,8 +734,8 @@ int main()
 
 	printf("Ciphered message:\n");
 	for (i = 0; i < 4; i++) {
-		printf("%02x %02x %02x %02x ", m[4*i+0], m[4*i+1], m[4*i+2], m[4*i+3]);
-		//printf("%02x %02x %02x %02x ", out[4*i+0], out[4*i+1], out[4*i+2], out[4*i+3]);
+		//printf("%02x %02x %02x %02x ", m[4*i+0], m[4*i+1], m[4*i+2], m[4*i+3]);
+		printf("%02x %02x %02x %02x ", out[4*i+0], out[4*i+1], out[4*i+2], out[4*i+3]);
 	}
 
 	printf("\n");