X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/0f00dc4c8eb47e67bc0f148c2dd109f73a451e0a..23bbea75793621e6b21fbb13c00d8223113cf7b5:/symm/safer-mktab.c

diff --git a/symm/safer-mktab.c b/symm/safer-mktab.c
index d9ae784..11e9b9d 100644
--- a/symm/safer-mktab.c
+++ b/symm/safer-mktab.c
@@ -56,41 +56,38 @@ int main(void)
  * SAFER tables [generated]\n\
  */\n\
 \n\
-#ifndef CATACOMB_SAFER_TAB_H\n\
-#define CATACOMB_SAFER_TAB_H\n\
+#include <mLib/bits.h>\n\
 \n\
 ", stdout);
 
   fputs("\
 /* --- S-boxes --- */\n\
 \n\
-#define SAFER_S {							\\\n\
+const octet safer_s[256] = {\n\
   ", stdout);
   for (i = 0; i < 256; i++) {
     printf("0x%02x", s[i]);
     if (i == 255)
-      fputs("			\\\n}\n\n", stdout);
+      fputs("\n};\n\n", stdout);
     else if ((i + 1)%8 == 0)
-      fputs(",			\\\n  ", stdout);
+      fputs(",\n  ", stdout);
     else
       fputs(", ", stdout);
   }
 
   fputs("\
-#define SAFER_SI {							\\\n\
+const octet safer_si[256] = {\n\
   ", stdout);
   for (i = 0; i < 256; i++) {
     printf("0x%02x", si[i]);
     if (i == 255)
-      fputs("			\\\n}\n\n", stdout);
+      fputs("\n};\n", stdout);
     else if ((i + 1)%8 == 0)
-      fputs(",			\\\n  ", stdout);
+      fputs(",\n  ", stdout);
     else
       fputs(", ", stdout);
   }
 
-  puts("#endif");
-
   if (fclose(stdout)) {
     fprintf(stderr, "error writing data\n");
     exit(EXIT_FAILURE);