X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-tcl.git;a=blobdiff_plain;f=hbytes%2Fhbytes.h;h=ac19c8f9cd941f2ac1aa95fcd2a7daee442e601a;hp=4422d328c99e3914243f76a7174b376f6b90e809;hb=ac8c0b3b18075ae4273779544eda01c09cfb5145;hpb=12cb589d468d6c93b04dfabe645ce761a81c5328 diff --git a/hbytes/hbytes.h b/hbytes/hbytes.h index 4422d32..ac19c8f 100644 --- a/hbytes/hbytes.h +++ b/hbytes/hbytes.h @@ -13,6 +13,36 @@ * hbytes chopto VAR NEWVARLENGTH => suffix (removed from VAR) * (too short? error) * + * hbytes range VALUE START SIZE => substring (or error) + * hbytes overwrite VAR START VALUE + * hbytes trimleft VALUE removes any leading 0 octets + * hbytes repeat VALUE COUNT => COUNT copies of VALUE + * + * hbytes clockincrement VAR INTEGER adds INTEGER to VAR mod 256^|VAR| + * INTEGER must be -255 .. 255 + * => carry (-255 to 255, + * and -1,0,1 if VAR not empty) + * + * hbytes h2ulong HEX => ulong (HEX len must be 4) + * hbytes ulong2h UL => hex + * + * ulong ul2bitfields VALUE [SIZE TYPE [TYPE-ARG...] ...] => 0/1 + * ulong bitfields2ul BASE [SIZE TYPE [TYPE-ARG...] ...] => ULONG + * goes from left (MSbit) to right (LSbit) where + * SIZE is size in bits + * TYPE [TYPE-ARGS...] is as below + * zero + * ignore + * fixed ULONG-VALUE + * uint VARNAME/VALUE (VARNAME if ul2bitfields; + * ulong VARNAME/VALUE VALUE if bitfields2ul) + * + * ulong ul2int ULONG => INT can fail if >INT_MAX + * ulong int2ul INT => ULONG can fail if <0 + * + * hbytes shift l|r ULONG BITS fails if BITS >32 + * hbytes mask A B => A & B + * * hbytes compare A B * => -2 A is lexically earlier than B and not a prefix of B (A worked? (always 1 for p) * hbytes pkcs5 pn|un VAR BLOCKSIZE => worked? (always 1 for p) * hbytes blockcipher d|e VAR ALG KEY MODE [IV] => IV + * hbytes blockcipher mac MSG ALG KEY MODE IV => final block * * hbytes hash ALG MESSAGE => hash * hbytes hmac ALG MESSAGE KEY [MACLENGTH] => mac @@ -120,7 +151,7 @@ void sockaddr_free(const SockAddr_Value*); /* from dgram.c */ -extern Tcl_ObjType sockid_type; +extern Tcl_ObjType dgramsockid_type; typedef struct DgramSocket *DgramSockID; /* from hook.c */ @@ -134,6 +165,11 @@ void obj_updatestr_array(Tcl_Obj *o, const Byte *array, int l); void obj_updatestr_array_prefix(Tcl_Obj *o, const Byte *byte, int l, const char *prefix); +void obj_updatestr_vstringls(Tcl_Obj *o, ...); + /* const char*, int, const char*, int, ..., (const char*)0 */ +void obj_updatestr_string_len(Tcl_Obj *o, const char *str, int l); +void obj_updatestr_string(Tcl_Obj *o, const char *str); + /* from parse.c */ typedef struct { @@ -144,6 +180,11 @@ typedef struct { void fini_hbv(Tcl_Interp *ip, int rc, HBytes_Var *agg); /* from chop.c */ + /* only do_... functions declared in tables.h */ + +/* from ulong.c */ + +Tcl_ObjType ulong_type; /* from enum.c */ @@ -185,25 +226,25 @@ typedef struct { const char *name; int hashsize, blocksize, statesize; void (*init)(void *state); - void (*update)(void *state, const Byte *data, int len); - void (*final)(void *state, Byte *digest); - void (*oneshot)(Byte *digest, const Byte *data, int len); + void (*update)(void *state, const void *data, int len); + void (*final)(void *state, void *digest); + void (*oneshot)(void *digest, const void *data, int len); } HashAlgInfo; extern const HashAlgInfo hashalginfos[]; typedef struct { - void (*make_schedule)(void *schedule, const Byte *key, int keylen); + void (*make_schedule)(void *schedule, const void *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; +} BlockCipherPerDirectionInfo; typedef struct { const char *name; int blocksize, schedule_size, key_min, key_max; - void (*byteswap)(Byte *block); - BlockCipherDirectionInfo encrypt, decrypt; + void (*byteswap)(void *block); + BlockCipherPerDirectionInfo encrypt, decrypt; } BlockCipherAlgInfo; extern const BlockCipherAlgInfo blockcipheralginfos[]; @@ -212,16 +253,31 @@ extern const BlockCipherAlgInfo blockcipheralginfos[]; typedef struct { const char *name; - int iv_blocks, buf_blocks; - const char *(*encrypt)(Byte *data, int blocks, + int iv_blocks, buf_blocks, mac_blocks; + + /* Each function is allowed to use up to buf_blocks * blocksize + * bytes of space in buf. data is blocks * blocksize bytes + * long. data should be modified in place by encrypt and decrypt; + * modes may not change the size of data. iv is always provided and + * is always of length iv_blocks * blocksize; encrypt and + * decrypt may modify the iv value (in which case the Tcl caller + * will get the modified IV) but this is not recommended. mac + * should leave the mac, which must be mac_blocks * blocksize + * bytes, in buf. (Therefore mac_blocks must be at least + * buf_blocks.) + */ + const char *(*encrypt)(Byte *data, int nblocks, const Byte *iv, Byte *buf, const BlockCipherAlgInfo *alg, int encr, - int blocksize, const void *sch); - const char *(*decrypt)(Byte *data, int blocks, + const void *sch); + const char *(*decrypt)(Byte *data, int nblocks, 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 */ + const void *sch); + const char *(*mac)(const Byte *data, int nblocks, + const Byte *iv, Byte *buf, + const BlockCipherAlgInfo *alg, + const void *sch); } BlockCipherModeInfo; extern const BlockCipherModeInfo blockciphermodeinfos[];