X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;ds=sidebyside;f=crypto%2Falgtables.c;h=8f796ce2333b726053f7df0bb928201e863c04b9;hb=fa11284b9469c1c79af7f8f129da934c1ebcf594;hp=87b365b412491a7b653f3282b9b30f89f15bc64d;hpb=b845521abfac164a92742f984eafb91d5d7c743d;p=chiark-tcl.git

diff --git a/crypto/algtables.c b/crypto/algtables.c
index 87b365b..8f796ce 100644
--- a/crypto/algtables.c
+++ b/crypto/algtables.c
@@ -5,71 +5,93 @@
 #include <netinet/in.h>
 
 #include "hbytes.h"
-#include "serpent.h"
-#include "sha1.h"
-#include "md5.h"
 
-static void alg_serpent_byteswap_block(Byte *b) {
-  uint32_t t, *a= (void*)b;
+#include <nettle/md5.h>
+#include <nettle/sha.h>
+#include <nettle/serpent.h>
+#include <nettle/twofish.h>
+#include <nettle/aes.h>
+#include <nettle/blowfish.h>
 
-  t=    htonl(a[0]);
-  a[0]= htonl(a[3]);
-  a[3]= t;
+#define NETTLE_BLOCKCIPHERS			\
+  DO(serpent,  SERPENT)				\
+  DO(twofish,  TWOFISH)				\
+  DO(aes,      AES)				\
+  DO(blowfish, BLOWFISH)			\
+  ALIAS(rijndael, aes, AES)
 
-  t=    htonl(a[1]);
-  a[1]= htonl(a[2]);
-  a[2]= t;
-}
-
-static void alg_serpent_makekey(void *schedule, const Byte *key, int keylen) {
-  serpent_makekey(schedule, keylen*8, key);
-}
-
-static void alg_serpent_encrypt(const void *sch, const void *in, void *out) {
-  serpent_encrypt(sch, in, out);
-}
-  
-static void alg_serpent_decrypt(const void *sch, const void *in, void *out) {
-  serpent_decrypt(sch, in, out);
-}
+#define ALIAS(alias,name,NAME)
+#define DO(name,NAME)							      \
+  static void alg_##name##_makekey(void *sch, const void *key, int keylen) {  \
+    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);		      \
+  }									      \
+  static void alg_##name##_decr(const void *sch, const void *in, void *out) { \
+    ##name##_decrypt((void*)sch, NAME##_BLOCK_SIZE, out, in);		      \
+  }
+  NETTLE_BLOCKCIPHERS
+#undef DO
+#undef ALIAS
 
 const BlockCipherAlgInfo blockcipheralginfos[]= {
-  { "serpent", 16, sizeof(struct SerpentKeyInstance), 16,32,
-    alg_serpent_byteswap_block,
-    { alg_serpent_makekey, alg_serpent_encrypt },
-    { alg_serpent_makekey, alg_serpent_decrypt } },
+#define ALIAS(alias,name,NAME)					\
+  { #alias, NAME##_BLOCK_SIZE, sizeof(struct name##_ctx),	\
+       NAME##_MIN_KEY_SIZE, NAME##_MAX_KEY_SIZE,		\
+    { alg_##name##_makekey, alg_##name##_encr },		\
+    { alg_##name##_makekey, alg_##name##_decr }			\
+  },
+#define DO(name,NAME) ALIAS(name,name,NAME)
+  NETTLE_BLOCKCIPHERS
+#undef DO
+#undef ALIAS
+  { 0 }
+};
+
+const BlockCipherPropInfo blockcipherpropinfos[]= {
+  { "blocklen",  offsetof(BlockCipherAlgInfo, blocksize) },
+  { "minkeylen", offsetof(BlockCipherAlgInfo, key_min)   },
+  { "maxkeylen", offsetof(BlockCipherAlgInfo, key_max)   },
   { 0 }
 };
 
-static void alg_sha1_init(void *state) { sha1_init(state); }
-static void alg_sha1_update(void *state, const Byte *data, int len) {
-  sha1_update(state, data, len);
-}
-static void alg_sha1_final(void *state, Byte *digest) {
-  sha1_final(state, digest);
-}
-static void alg_sha1_oneshot(Byte *digest, const Byte *data, int len) {
-  sha1(data,len,digest);
-}
+#define NETTLE_DIGESTS				\
+  DO(sha1,   SHA1)				\
+  DO(sha256, SHA256)				\
+  DO(md5,    MD5)
+
+#define DO(name,NAME)							      \
+  static void alg_##name##_init(void *state) {				      \
+    name##_init(state);							      \
+  }									      \
+  static void alg_##name##_update(void *state, const void *data, int len) {   \
+    name##_update(state, len, data);					      \
+  }									      \
+  static void alg_##name##_final(void *state, void *digest) {		      \
+    name##_digest(state,NAME##_DIGEST_SIZE,digest);			      \
+  }									      \
+  static void alg_##name##_oneshot(void *digest, const void *data, int len) { \
+    struct name##_ctx ctx;						      \
+    name##_init(&ctx);							      \
+    name##_update(&ctx, len, data);					      \
+    name##_digest(&ctx,NAME##_DIGEST_SIZE,digest);			      \
+  }
+  NETTLE_DIGESTS
+#undef DO
 
-static void alg_md5_init(void *state) { MD5Init(state); }
-static void alg_md5_update(void *state, const Byte *data, int len) {
-  MD5Update(state, data, len);
-}
-static void alg_md5_final(void *state, Byte *digest) {
-  MD5Final(digest, state);
-}
-static void alg_md5_oneshot(Byte *digest, const Byte *data, int len) {
-  struct MD5Context ctx;
-  MD5Init(&ctx);
-  MD5Update(&ctx,data,len);
-  MD5Final(digest,&ctx);
-}
+const HashAlgPropInfo hashalgpropinfos[]= {
+  { "hashlen",  offsetof(HashAlgInfo, hashsize)  },
+  { "blocklen", offsetof(HashAlgInfo, blocksize) },
+  { 0 }
+};
 
 const HashAlgInfo hashalginfos[]= {
-  { "sha1", 20, 64, sizeof(struct sha1_state),
-    alg_sha1_init, alg_sha1_update, alg_sha1_final, alg_sha1_oneshot },
-  { "md5", 16, 64, sizeof(struct MD5Context),
-    alg_md5_init, alg_md5_update, alg_md5_final, alg_md5_oneshot },
+#define DO(name,NAME)							    \
+  { #name, NAME##_DIGEST_SIZE, NAME##_DATA_SIZE, sizeof(struct name##_ctx), \
+    alg_##name##_init, alg_##name##_update, alg_##name##_final,		    \
+    alg_##name##_oneshot },
+  NETTLE_DIGESTS
+#undef DO
   { 0 }
 };