X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=base%2Fchiark-tcl.h;h=f57b037f649078b6c2661b968f338a1c48ffe893;hb=b7effca02db339dd29fb17c8e40e39edd90e8fa4;hp=7b66932a2eb87c45ba4bcb8809a29d03f9b76582;hpb=f9ddca2f19d966e0d64d5bc6de023dbc3764552c;p=chiark-tcl.git diff --git a/base/chiark-tcl.h b/base/chiark-tcl.h index 7b66932..f57b037 100644 --- a/base/chiark-tcl.h +++ b/base/chiark-tcl.h @@ -17,6 +17,9 @@ * hbytes overwrite VAR START VALUE * hbytes trimleft VAR removes any leading 0 octets * hbytes repeat VALUE COUNT => COUNT copies of VALUE + * hbytes zeroes COUNT => COUNT zero bytes + * hbytes random COUNT => COUNT random bytes + * hbytes xor VAR VALUE $VAR (+)= VALUE * * hbytes ushort2h LONG => LONG must be <2^16, returns as hex * hbytes h2ushort HEX => |HEX| must be 2 bytes, returns as ulong @@ -28,20 +31,27 @@ * +1 A is B plus a nonempty suffix (ie, A has B as a prefix) * +2 A is lexically later than B and does not have B as a prefix * - * hbytes pkcs5 pa|ua VAR ALG => worked? (always 1 for p) - * hbytes pkcs5 pn|un VAR BLOCKSIZE => worked? (always 1 for p) + * hbytes pad pa|ua VAR ALG METH [METHARGS] => worked? (always 1 for p) + * hbytes pad pn|un VAR BS METH [METHARGS] => worked? (always 1 for p) + * hbytes pad pa|pn VAR ALG|BS pkcs5 => 1 + * hbytes pad ua|un VAR ALG|BS pkcs5 => worked? + * hbytes pad pa|pn VAR ALG|BS rfc2406 NXTHDR => 1 + * hbytes pad ua|un VAR ALG|BS rfc2406 NXTHDRVAR => worked? + * * hbytes blockcipher d|e VAR ALG KEY MODE [IV] => IV * hbytes blockcipher mac MSG ALG KEY MODE IV => final block + * hbytes blockcipher prop PROPERTY ALG => property value * * hbytes hash ALG MESSAGE => hash * hbytes hmac ALG MESSAGE KEY [MACLENGTH] => mac + * hbytes hash-prop PROPERTY ALG => property value * * ulong ul2int ULONG => INT can fail if >INT_MAX * ulong int2ul INT => ULONG can fail if <0 * ulong mask A B => A & B * ulong add A B => A + B (mod 2^32) * ulong subtract A B => A - B (mod 2^32) - * ulong compare A B => 0/-1/1 + * ulong compare A B => 0 -1 (AB) * ulong shift l|r ULONG BITS fails if BITS >32 * * ulong ul2bitfields VALUE [SIZE TYPE [TYPE-ARG...] ...] => 0/1 @@ -55,6 +65,14 @@ * uint VARNAME/VALUE (VARNAME if ul2bitfields; * ulong VARNAME/VALUE VALUE if bitfields2ul) * + * hbytes mask-map lookup MAP-VAR ADDRESS [DEFAULT] => DATA + * error on missing default or if address too short + * hbytes mask-map amend MAP-VAR PREFIX PREFIX-LENGTH DATA + * a maskmap MAP is [list [list PREFIX PREFIX-LENGTH DATA]] sorted + * first by descending PREFIX-LENGTH and then by ascending PREFIX + * each PREFIX _in the map_ is truncated to the shortest number of + * pairs of hex digits which can represent it + * * Error codes * * HBYTES BLOCKCIPHER CRYPTFAIL CRYPT block cipher mode failed somehow (!) @@ -65,8 +83,13 @@ * HBYTES LENGTH OVERRUN block too long * HBYTES LENGTH RANGE input length or offset is -ve or silly * HBYTES LENGTH UNDERRUN block too short (or offset too big) + * HBYTES LENGTH MISMATCH when blocks must be exactly same length * HBYTES SYNTAX supposed hex block had wrong syntax * HBYTES VALUE OVERFLOW value to be conv'd to hex too big/long + * HBYTES MASKMAP SYNTAX LLENGTH value for mask-map entry not llength==3 + * HBYTES MASKMAP SYNTAX UNDERRUN value for mask-map entry hex too short + * HBYTES MASKMAP SYNTAX OVERRUN actual mask-map entry hex too short + * HBYTES MASKMAP SYNTAX ORDER actual mask-map is disordered * SOCKADDR AFUNIX LENGTH path for AF_UNIX socket too long * SOCKADDR SYNTAX IPV4 bad IPv4 socket address &/or port * SOCKADDR SYNTAX OTHER bad socket addr, couldn't tell what kind @@ -75,6 +98,8 @@ * ULONG BITCOUNT UNDERRUN bitfields add up to less than 32 * ULONG VALUE NEGATIVE attempt convert -ve integers to ulong * ULONG VALUE OVERFLOW converted value does not fit in result + * TUNTAP IFNAME LENGTH tun/tap interface name too long + * TUNTAP MTU OVERRUN tun/tap mtu limited to 2^16 bytes * * Refs: HMAC: RFC2104 */ @@ -92,7 +117,7 @@ #include #include -#include +#include typedef unsigned char Byte; @@ -167,10 +192,40 @@ int sockaddr_len(const SockAddr_Value*); const struct sockaddr *sockaddr_addr(const SockAddr_Value*); void sockaddr_free(const SockAddr_Value*); +/* from scriptinv.c */ + +typedef struct { /* semi-opaque - read only, and then only where commented */ + Tcl_Interp *ip; /* valid, non-0 and useable if set */ + Tcl_Obj *obj; /* non-0 iff set (but only test for 0/non-0) */ + int llength; +} ScriptToInvoke; + +void scriptinv_init(ScriptToInvoke *si); +int scriptinv_set(ScriptToInvoke *si, Tcl_Interp *ip, Tcl_Obj *newscript); +void scriptinv_cancel(ScriptToInvoke *si); /* then don't invoke */ + /* no separate free function - just cancel */ + +void scriptinv_invoke(ScriptToInvoke *si, int argc, Tcl_Obj **argv); + +/* from idtable.c */ + +typedef struct { + const char *const prefix; + int n; + void **a; +} IdDataTable; + +extern Tcl_ObjType tabledataid_nearlytype; +int tabledataid_parse(Tcl_Interp *ip, Tcl_Obj *o, IdDataTable *tab); + /* from dgram.c */ -extern Tcl_ObjType dgramsockid_type; -typedef struct DgramSocket *DgramSockID; +extern IdDataTable dgram_socks; +int newfdposixerr(Tcl_Interp *ip, int fd, const char *m); + +/* from tuntap.c */ + +extern IdDataTable tuntap_socks; /* from hook.c */ @@ -191,12 +246,30 @@ void obj_updatestr_string(Tcl_Obj *o, const char *str); /* from parse.c */ typedef struct { - HBytes_Value *hb; Tcl_Obj *obj, *var; int copied; +} Something_Var; + +void init_somethingv(Something_Var *sth); +void fini_somethingv(Tcl_Interp *ip, int rc, Something_Var *sth); +int pat_somethingv(Tcl_Interp *ip, Tcl_Obj *var, + Something_Var *sth, Tcl_ObjType *type); + +typedef struct { + HBytes_Value *hb; + Something_Var sth; } HBytes_Var; -void fini_hbv(Tcl_Interp *ip, int rc, HBytes_Var *agg); +/* from maskmap.c */ + +typedef struct MaskMap_Value MaskMap_Value; + +typedef struct { + MaskMap_Value *mm; + Something_Var sth; +} MaskMap_Var; + +extern Tcl_ObjType maskmap_type; /* from chop.c */ /* only do_... functions declared in tables.h */ @@ -235,12 +308,17 @@ void memxor(Byte *dest, const Byte *src, int l); typedef struct { const char *name; int pad, use_algname; -} PadMethod; +} PadOp; extern Tcl_ObjType blockcipherkey_type; /* from algtables.c */ +typedef struct { + const char *name; + int int_offset; +} BlockCipherPropInfo, HashAlgPropInfo; + typedef struct { const char *name; int hashsize, blocksize, statesize; @@ -262,7 +340,6 @@ typedef struct { typedef struct { const char *name; int blocksize, schedule_size, key_min, key_max; - void (*byteswap)(void *block); BlockCipherPerDirectionInfo encrypt, decrypt; } BlockCipherAlgInfo;