X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-tcl.git;a=blobdiff_plain;f=crypto%2Falgtables.c;h=e0d6cc8bb3fddb2bc75f6e4bb288e6eba873907b;hp=24ebba7c5e1cd249740f294973a6627cbb14fcb9;hb=50b72ed6d566c8afbd3afb5c565eca002a737e7a;hpb=43f84d7998000957da8c0441d7658cdf633f90a1

diff --git a/crypto/algtables.c b/crypto/algtables.c
index 24ebba7..e0d6cc8 100644
--- a/crypto/algtables.c
+++ b/crypto/algtables.c
@@ -1,11 +1,23 @@
 /*
+ * crypto - Tcl bindings for parts of the `nettle' crypto library
+ * Copyright 2006-2012 Ian Jackson
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdint.h>
-#include <stddef.h>
-#include <netinet/in.h>
 
-#include "hbytes.h"
+#include "chiark_tcl_crypto.h"
 
 #include <nettle/md5.h>
 #include <nettle/sha.h>
@@ -17,9 +29,9 @@
 #define NETTLE_BLOCKCIPHERS			\
   DO(serpent,  SERPENT)				\
   DO(twofish,  TWOFISH)				\
-  DO(aes,      AES)				\
+/* DO(aes,      AES) */				\
   DO(blowfish, BLOWFISH)			\
-  ALIAS(rijndael, aes, AES)
+  /*  ALIAS(rijndael, aes, AES)*/
 
 #define ALIAS(alias,name,NAME)
 #define DO(name,NAME)							      \
@@ -27,16 +39,16 @@
     name##_set_key(sch, keylen, key);					      \
   }									      \
   static void alg_##name##_encr(const void *sch, const void *in, void *out) { \
-    ##name##_encrypt((void*)sch, NAME##_BLOCK_SIZE, out, in);		      \
+    name##_encrypt((void*)sch, NAME##_BLOCK_SIZE, out, in);		      \
   }									      \
   static void alg_##name##_decr(const void *sch, const void *in, void *out) { \
-    ##name##_decrypt((void*)sch, NAME##_BLOCK_SIZE, out, in);		      \
+    name##_decrypt((void*)sch, NAME##_BLOCK_SIZE, out, in);		      \
   }
   NETTLE_BLOCKCIPHERS
 #undef DO
 #undef ALIAS
 
-const BlockCipherAlgInfo blockcipheralginfos[]= {
+const BlockCipherAlgInfo cht_blockcipheralginfo_entries[]= {
 #define ALIAS(alias,name,NAME)					\
   { #alias, NAME##_BLOCK_SIZE, sizeof(struct name##_ctx),	\
        NAME##_MIN_KEY_SIZE, NAME##_MAX_KEY_SIZE,		\
@@ -50,7 +62,7 @@ const BlockCipherAlgInfo blockcipheralginfos[]= {
   { 0 }
 };
 
-const BlockCipherPropInfo blockcipherpropinfos[]= {
+const BlockCipherPropInfo cht_blockcipherpropinfo_entries[]= {
   { "blocklen",  offsetof(BlockCipherAlgInfo, blocksize) },
   { "minkeylen", offsetof(BlockCipherAlgInfo, key_min)   },
   { "maxkeylen", offsetof(BlockCipherAlgInfo, key_max)   },
@@ -81,13 +93,13 @@ const BlockCipherPropInfo blockcipherpropinfos[]= {
   NETTLE_DIGESTS
 #undef DO
 
-const HashAlgPropInfo hashalgpropinfos[]= {
+const HashAlgPropInfo cht_hashalgpropinfo_entries[]= {
   { "hashlen",  offsetof(HashAlgInfo, hashsize)  },
   { "blocklen", offsetof(HashAlgInfo, blocksize) },
   { 0 }
 };
 
-const HashAlgInfo hashalginfos[]= {
+const HashAlgInfo cht_hashalginfo_entries[]= {
 #define DO(name,NAME)							    \
   { #name, NAME##_DIGEST_SIZE, NAME##_DATA_SIZE, sizeof(struct name##_ctx), \
     alg_##name##_init, alg_##name##_update, alg_##name##_final,		    \