* util/import_gcry.py: Automatically fix camellia.c and camellia.h.

diff --git a/ChangeLog b/ChangeLog
index fc5ab9806ba5a23fa4303dac60d94d0a1e0c0692..0198ba4ee30f82dd395e117461b54838ec257c69 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-10-23  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * util/import_gcry.py: Automatically fix camellia.c and camellia.h.
+
 2011-10-23  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * util/import_gcry.py: Accept space between # and include.

diff --git a/util/import_gcry.py b/util/import_gcry.py
index befa5ef5fbe86c0f20225c36b578c42e31197163..7591d8f0efefa4fd072bb70a7dcf958c7bd63fcc 100644 (file)
--- a/util/import_gcry.py
+++ b/util/import_gcry.py
@@ -104,6 +104,20 @@ for cipher_file in cipher_files:
         fw.write ("/* This file was automatically imported with \n")
         fw.write ("   import_gcry.py. Please don't modify it */\n")
         fw.write ("#include <grub/dl.h>\n")
+        if cipher_file == "camellia.c":
+            fw.write ("#include \"camellia.h\"\n")
+        if cipher_file == "camellia.h":
+            fw.write ("#include <grub/misc.h>\n")
+            fw.write ("void camellia_setup128(const unsigned char *key, grub_uint32_t *subkey);\n")
+            fw.write ("void camellia_setup192(const unsigned char *key, grub_uint32_t *subkey);\n")
+            fw.write ("void camellia_setup256(const unsigned char *key, grub_uint32_t *subkey);\n")
+            fw.write ("void camellia_encrypt128(const grub_uint32_t *subkey, grub_uint32_t *io);\n")
+            fw.write ("void camellia_encrypt192(const grub_uint32_t *subkey, grub_uint32_t *io);\n")                      
+            fw.write ("void camellia_encrypt256(const grub_uint32_t *subkey, grub_uint32_t *io);\n")                      
+            fw.write ("void camellia_decrypt128(const grub_uint32_t *subkey, grub_uint32_t *io);\n")
+            fw.write ("void camellia_decrypt192(const grub_uint32_t *subkey, grub_uint32_t *io);\n")                      
+            fw.write ("void camellia_decrypt256(const grub_uint32_t *subkey, grub_uint32_t *io);\n")                      
+            fw.write ("#define memcpy grub_memcpy\n")
         # Whole libgcrypt is distributed under GPLv3+ or compatible
         if isc:
             fw.write ("GRUB_MOD_LICENSE (\"GPLv3+\");\n")