Prepare data generation programs for compilation with the build system compiler.

1 files changed, 32 insertions, 34 deletions

diff --git a/twofishdata.c b/twofishdata.c
index 81090d50..53ac1715 100644
--- a/twofishdata.c
+++ b/twofishdata.c
@@ -19,84 +19,82 @@
 
 #include <stdio.h>
 
-#include "nettle-stdint.h"
-
 #define ror4(x) (((x) >> 1) | (((x) & 1) << 3))
 
-static uint8_t q0(uint8_t x)
+static unsigned char q0(unsigned char x)
 {
-    static const uint8_t t0[16] = {
+    static const unsigned char t0[16] = {
       0x8, 0x1, 0x7, 0xD, 0x6, 0xF, 0x3, 0x2,
       0x0, 0xB, 0x5, 0x9, 0xE, 0xC, 0xA, 0x4
     };
-    static const uint8_t t1[16] = {
+    static const unsigned char t1[16] = {
       0xE, 0xC, 0xB, 0x8, 0x1, 0x2, 0x3, 0x5,
       0xF, 0x4, 0xA, 0x6, 0x7, 0x0, 0x9, 0xD
     };
-    static const uint8_t t2[16] = {
+    static const unsigned char t2[16] = {
       0xB, 0xA, 0x5, 0xE, 0x6, 0xD, 0x9, 0x0,
       0xC, 0x8, 0xF, 0x3, 0x2, 0x4, 0x7, 0x1
     };
-    static const uint8_t t3[16] = {
+    static const unsigned char t3[16] = {
       0xD, 0x7, 0xF, 0x4, 0x1, 0x2, 0x6, 0xE,
       0x9, 0xB, 0x3, 0x0, 0x8, 0x5, 0xC, 0xA
     };
 
-    uint8_t a0 = x / 16;
-    uint8_t b0 = x % 16;
+    unsigned char a0 = x / 16;
+    unsigned char b0 = x % 16;
 
-    uint8_t a1 = a0 ^ b0;
-    uint8_t b1 = a0 ^ ror4(b0) ^ ((8*a0) % 16);
+    unsigned char a1 = a0 ^ b0;
+    unsigned char b1 = a0 ^ ror4(b0) ^ ((8*a0) % 16);
 
-    uint8_t a2 = t0[a1];
-    uint8_t b2 = t1[b1];
+    unsigned char a2 = t0[a1];
+    unsigned char b2 = t1[b1];
 
-    uint8_t a3 = a2 ^ b2;
-    uint8_t b3 = a2 ^ ror4(b2) ^ ((8*a2) % 16);
+    unsigned char a3 = a2 ^ b2;
+    unsigned char b3 = a2 ^ ror4(b2) ^ ((8*a2) % 16);
 
-    uint8_t a4 = t2[a3];
-    uint8_t b4 = t3[b3];
+    unsigned char a4 = t2[a3];
+    unsigned char b4 = t3[b3];
 
-    uint8_t y = 16*b4 + a4;
+    unsigned char y = 16*b4 + a4;
 
     return y;
 }
 
-static uint8_t q1(uint8_t x)
+static unsigned char q1(unsigned char x)
 {
-  static const uint8_t t0[16] = {
+  static const unsigned char t0[16] = {
     0x2, 0x8, 0xB, 0xD, 0xF, 0x7, 0x6, 0xE,
     0x3, 0x1, 0x9, 0x4, 0x0, 0xA, 0xC, 0x5
   };
-  static const uint8_t t1[16] = {
+  static const unsigned char t1[16] = {
     0x1, 0xE, 0x2, 0xB, 0x4, 0xC, 0x3, 0x7,
     0x6, 0xD, 0xA, 0x5, 0xF, 0x9, 0x0, 0x8
   };
-  static const uint8_t t2[16] = {
+  static const unsigned char t2[16] = {
     0x4, 0xC, 0x7, 0x5, 0x1, 0x6, 0x9, 0xA,
     0x0, 0xE, 0xD, 0x8, 0x2, 0xB, 0x3, 0xF
   };
-  static const uint8_t t3[16] = {
+  static const unsigned char t3[16] = {
     0xB, 0x9, 0x5, 0x1, 0xC, 0x3, 0xD, 0xE,
     0x6, 0x4, 0x7, 0xF, 0x2, 0x0, 0x8, 0xA
   };
 
-  uint8_t a0 = x / 16;
-  uint8_t b0 = x % 16;
+  unsigned char a0 = x / 16;
+  unsigned char b0 = x % 16;
 
-  uint8_t a1 = a0 ^ b0;
-  uint8_t b1 = a0 ^ ror4(b0) ^ ((8*a0) % 16);
+  unsigned char a1 = a0 ^ b0;
+  unsigned char b1 = a0 ^ ror4(b0) ^ ((8*a0) % 16);
 
-  uint8_t a2 = t0[a1];
-  uint8_t b2 = t1[b1];
+  unsigned char a2 = t0[a1];
+  unsigned char b2 = t1[b1];
 
-  uint8_t a3 = a2 ^ b2;
-  uint8_t b3 = a2 ^ ror4(b2) ^ ((8*a2) % 16);
+  unsigned char a3 = a2 ^ b2;
+  unsigned char b3 = a2 ^ ror4(b2) ^ ((8*a2) % 16);
 
-  uint8_t a4 = t2[a3];
-  uint8_t b4 = t3[b3];
+  unsigned char a4 = t2[a3];
+  unsigned char b4 = t3[b3];
 
-  uint8_t y = 16*b4 + a4;
+  unsigned char y = 16*b4 + a4;
 
   return y;
 }