Padding works.

[chiark-tcl.git] / base / chiark-tcl.h

diff --git a/base/chiark-tcl.h b/base/chiark-tcl.h
index ee69928237e7202581091154da3bbe9e41d3cfb4..cfc96e912f9fd994de502e05c69c0f7e57ab04de 100644 (file)
--- a/base/chiark-tcl.h
+++ b/base/chiark-tcl.h
@@ -4,6 +4,7 @@
  *  hbytes raw2h BINARY                          => hex
  *  hbytes h2raw HEX                             => binary
  *
+ *  hbytes length VALUE                          => count
  *  hbytes prepend VAR [VALUE ...]         = set VAR [concat VALUE ... $VAR]
  *  hbytes append VAR [VALUE ...]          = set VAR [concat $VAR VALUE ...]
  *  hbytes concat VAR [VALUE ...]          = set VAR [concat VALUE ...]
@@ -113,7 +114,7 @@ const void *enum_lookup_cached_func(Tcl_Interp *ip, Tcl_Obj *o,
                                    const char *what);
 #define enum_lookup_cached(ip,o,table,what)                    \
     (enum_lookup_cached_func((ip),(o),                         \
-                            sizeof((table)[0]),&(table)[0],    \
+                            &(table)[0],sizeof((table)[0]),    \
                             (what)))
   /* table should be a pointer to an array of structs of size
    * entrysize, the first member of which should be a const char*.
@@ -128,18 +129,55 @@ int enum1_lookup_cached_func(Tcl_Interp *ip, Tcl_Obj *o,
 
 /* from crypto.c */
 
+void memxor(Byte *dest, const Byte *src, int l);
+
+typedef struct {
+  const char *name;
+  int pad, use_algname;
+} PadMethod;
+
+/* from hash.c */
+
 typedef struct {
   int blocksize, hashsize;
 } HashAlgInfo;
 
+/* from blockciph.c */
+
 typedef struct {
-  int blocksize;
+  void (*make_schedule)(void *schedule, const Byte *key, int keylen);
+  void (*crypt)(const void *schedule, const void *in, void *out);
+     /* in and out may be the same, but if they aren't they may not overlap */
+     /* in and out for crypt will have been through block_byteswap */
+} BlockCipherDirectionInfo;
+
+typedef struct {
+  const char *name;
+  int blocksize, schedule_size, key_min, key_max;
+  void (*byteswap)(Byte *block);
+  BlockCipherDirectionInfo encrypt, decrypt;
 } BlockCipherAlgInfo;
 
+extern const BlockCipherAlgInfo blockcipheralginfos[];
+
+/* from bcmode.c */
+
 typedef struct {
-  int dummy;
+  const char *name;
+  int iv_blocks, buf_blocks;
+  const char *(*encrypt)(Byte *data, int blocks,
+                        const Byte *iv, Byte *buf,
+                        const BlockCipherAlgInfo *alg, int encr,
+                        int blocksize, const void *sch);
+  const char *(*decrypt)(Byte *data, int blocks,
+                        const Byte *iv, Byte *buf,
+                        const BlockCipherAlgInfo *alg, int encr,
+                        int blocksize, const void *sch);
+    /* in each case, *iv is provided, but may be modified */
 } BlockCipherModeInfo;
 
+extern const BlockCipherModeInfo blockciphermodeinfos[];
+
 /* useful macros */
 
 #define OBJ_HBYTES(o) ((HBytes_Value*)&(o)->internalRep.twoPtrValue)