*
* hbytes pkcs5 pa|ua VAR ALG => worked? (always 1 for p)
* hbytes pkcs5 pn|un VAR BLOCKSIZE => worked? (always 1 for p)
- * hbytes blockcipher d|e VAR ALG MODE [IV] => IV
+ * hbytes blockcipher d|e VAR ALG KEY MODE [IV] => IV
*
* hbytes hash ALG MESSAGE => hash
* hbytes hmac ALG MESSAGE KEY [MACLENGTH] => mac
int staticerr(Tcl_Interp *ip, const char *m);
void objfreeir(Tcl_Obj *o);
+void obj_updatestr_array(Tcl_Obj *o, const Byte *array, int l);
+int get_urandom(Tcl_Interp *ip, Byte *buffer, int l);
/* from parse.c */
int pad, use_algname;
} PadMethod;
+Tcl_ObjType blockcipherkey_type;
+
/* from hash.c */
typedef struct {
/*
*/
+#include <errno.h>
+
#include "hbytes.h"
#include "tables.h"
return TCL_ERROR;
}
+int posixerr(Tcl_Interp *ip, int errnoval, const char *m) {
+ const char *em;
+
+ Tcl_ResetResult(ip);
+ errno= errnoval;
+ em= Tcl_PosixError(ip);
+ Tcl_AppendResult(ip, m, ": ", em, (char*)0);
+ return TCL_ERROR;
+}
+
void objfreeir(Tcl_Obj *o) {
if (o->typePtr && o->typePtr->freeIntRepProc)
o->typePtr->freeIntRepProc(o);
}
int do_hbytes_rep_info(ClientData cd, Tcl_Interp *ip,
- HBytes_Value v, Tcl_Obj **result) {
+ Tcl_Obj *obj, Tcl_Obj **result) {
const char *tn;
- int nums[3], i;
+ int nums[3], i, lnl;
Tcl_Obj *objl[4];
- memset(nums,0,sizeof(nums));
- nums[1]= hbytes_len(&v);
+ if (obj->typePtr == &hbytes_type) {
+ HBytes_Value *v= OBJ_HBYTES(obj);
+ memset(nums,0,sizeof(nums));
+ nums[1]= hbytes_len(v);
- if (HBYTES_ISEMPTY(&v)) tn= "empty";
- else if (HBYTES_ISSENTINEL(&v)) tn= "sentinel!";
- else if (HBYTES_ISSIMPLE(&v)) tn= "simple";
- else {
- HBytes_ComplexValue *cx= v.begin_complex;
- tn= "complex";
- nums[0]= cx->prespace;
- nums[2]= cx->avail - cx->len;
+ if (HBYTES_ISEMPTY(v)) tn= "empty";
+ else if (HBYTES_ISSENTINEL(v)) tn= "sentinel!";
+ else if (HBYTES_ISSIMPLE(v)) tn= "simple";
+ else {
+ HBytes_ComplexValue *cx= v->begin_complex;
+ tn= "complex";
+ nums[0]= cx->prespace;
+ nums[2]= cx->avail - cx->len;
+ }
+ lnl= 3;
+ } else {
+ tn= "other";
+ lnl= 0;
}
objl[0]= Tcl_NewStringObj((char*)tn,-1);
- for (i=0; i<3; i++) objl[i+1]= Tcl_NewIntObj(nums[i]);
- *result= Tcl_NewListObj(4,objl);
+ for (i=0; i<lnl; i++) objl[i+1]= Tcl_NewIntObj(nums[i]);
+ *result= Tcl_NewListObj(lnl+1,objl);
+
return TCL_OK;
}
hbytes_free(OBJ_HBYTES(o));
}
-static void hbytes_t_ustr(Tcl_Obj *o) {
- int l;
+void obj_updatestr_array(Tcl_Obj *o, const Byte *byte, int l) {
char *str;
- const Byte *byte;
- byte= hbytes_data(OBJ_HBYTES(o));
- l= hbytes_len(OBJ_HBYTES(o));
str= o->bytes= TALLOC(l*2+1);
o->length= l*2;
while (l>0) {
*str= 0;
}
+static void hbytes_t_ustr(Tcl_Obj *o) {
+ obj_updatestr_array(o,
+ hbytes_data(OBJ_HBYTES(o)),
+ hbytes_len(OBJ_HBYTES(o)));
+}
+
static int hbytes_t_sfa(Tcl_Interp *ip, Tcl_Obj *o) {
char *str, *ep, *os;
Byte *startbytes, *bytes;
return subcmd->func(0,ip,objc,objv);
}
+#define URANDOM "/dev/urandom"
+
+int get_urandom(Tcl_Interp *ip, Byte *buffer, int l) {
+ static FILE *urandom;
+
+ int r, esave;
+
+ if (!urandom) {
+ urandom= fopen(URANDOM,"rb");
+ if (!urandom) return posixerr(ip,errno,"open " URANDOM);
+ }
+ r= fread(buffer,1,l,urandom);
+ if (r==l) return 0;
+
+ esave= errno;
+ fclose(urandom); urandom=0;
+
+ if (ferror(urandom)) {
+ return posixerr(ip,errno,"read " URANDOM);
+ } else {
+ assert(feof(urandom));
+ return staticerr(ip, URANDOM " gave eof!");
+ }
+}
+
int Hbytes_Init(Tcl_Interp *ip) {
Tcl_RegisterObjType(&hbytes_type);
+ Tcl_RegisterObjType(&blockcipherkey_type);
Tcl_RegisterObjType(&enum_nearlytype);
Tcl_RegisterObjType(&enum1_nearlytype);
Tcl_CreateObjCommand(ip,"hbytes", pa__hbytes,0,0);
v hbv
str ...
rep-info
- v hb
+ v obj
=> obj
concat
str ...
v hbv
block obj
=> int
-# blockcipher
-# encrypt charfrom("de","encrypt/decrypt")
-# v hbv
-# alg enum(BlockCipherAlgInfo, "alg")
-# mode enum(BlockCipherModeInfo, "mode")
-# ?iv hb
-# => hb
+ blockciph
+ encrypt charfrom("de","encrypt/decrypt")
+ v hbv
+ alg enum(BlockCipherAlgInfo, "alg")
+ key obj
+ mode enum(BlockCipherModeInfo, "mode")
+ ?iv hb
+ => hb
# hash
# alg enum(HashAlgInfo, "hash alg")
# message hb
TARGETS= hbytes.so
-CFLAGS= -g -Wall -O
+CFLAGS= -g -Wall $(OPTIMISE)
+OPTIMISE= -O2
all: $(TARGETS) $(AUTOS)
return 0;
}
+const char *mode_ecb(Byte *data, int blocks,
+ const Byte *iv, Byte *chain,
+ const BlockCipherAlgInfo *alg, int encr,
+ int blocksize, const void *sch) {
+ while (blocks > 0) {
+ alg->byteswap(data);
+ (encr ? &alg->encrypt : &alg->decrypt)->crypt(sch, data, data);
+ alg->byteswap(data);
+ blocks--; data += blocksize;
+ }
+ return 0;
+}
+
const BlockCipherModeInfo blockciphermodeinfos[]= {
{ "cbc", 1, 2, mode_cbc_encrypt, mode_cbc_decrypt },
+ { "ecb", 0, 0, mode_ecb, mode_ecb },
{ 0 }
};
*ok= 0;
return TCL_OK;
}
+
+#define OBJ_CIPHKEY(o) ((CiphKeyValue*)(o)->internalRep.otherValuePtr)
+
+typedef struct {
+ int valuelen, bufferslen;
+ Byte *value, *buffers;
+ const BlockCipherAlgInfo *alg;
+ void *encrypt, *decrypt; /* key schedules; each may be 0 */
+} CiphKeyValue;
+
+static void freealg(CiphKeyValue *key) {
+ TFREE(key->encrypt);
+ TFREE(key->decrypt);
+}
+
+static void key_t_free(Tcl_Obj *obj) {
+ CiphKeyValue *key= OBJ_CIPHKEY(obj);
+ freealg(key);
+ TFREE(key->value);
+ TFREE(key->buffers);
+}
+
+static void noalg(CiphKeyValue *key) {
+ key->alg= 0;
+ key->encrypt= key->decrypt= 0;
+}
+
+static void key_t_dup(Tcl_Obj *src_obj, Tcl_Obj *dup_obj) {
+ CiphKeyValue *src= OBJ_CIPHKEY(src_obj);
+ CiphKeyValue *dup= TALLOC(sizeof(*dup));
+ dup->valuelen= src->valuelen;
+ dup->value= src->valuelen ? TALLOC(src->valuelen) : 0;
+ dup->buffers= 0; dup->bufferslen= 0;
+ memcpy(dup->value, src->value, src->valuelen);
+ noalg(dup);
+ dup_obj->internalRep.otherValuePtr= dup;
+}
+
+static void key_t_ustr(Tcl_Obj *o) {
+ obj_updatestr_array(o, OBJ_CIPHKEY(o)->value, OBJ_CIPHKEY(o)->valuelen);
+}
+
+static int key_t_sfa(Tcl_Interp *ip, Tcl_Obj *o) {
+ int rc, l;
+ CiphKeyValue *val;
+
+ rc= Tcl_ConvertToType(ip,o,&hbytes_type); if (rc) return rc;
+ val= TALLOC(sizeof(*val));
+ val->valuelen= l= hbytes_len(OBJ_HBYTES(o));
+ val->value= TALLOC(l);
+ val->buffers= 0;
+ val->bufferslen= 0;
+ memcpy(val->value, hbytes_data(OBJ_HBYTES(o)), l);
+ noalg(val);
+
+ objfreeir(o);
+ o->internalRep.otherValuePtr= val;
+ o->typePtr= &blockcipherkey_type;
+
+ return TCL_OK;
+}
+
+Tcl_ObjType blockcipherkey_type = {
+ "blockcipher-key",
+ key_t_free, key_t_dup, key_t_ustr, key_t_sfa
+};
+
+int do_hbytes_blockciph(ClientData cd, Tcl_Interp *ip, int encrypt,
+ HBytes_Var v, const BlockCipherAlgInfo *alg,
+ Tcl_Obj *key_obj, const BlockCipherModeInfo *mode,
+ HBytes_Value iv, HBytes_Value *result) {
+ int rc, want_bufferslen, data_len, iv_want;
+ CiphKeyValue *key;
+ const char *failure;
+ void *sched, **schedp;
+
+ rc= Tcl_ConvertToType(ip,key_obj,&blockcipherkey_type); if (rc) return rc;
+ key= OBJ_CIPHKEY(key_obj);
+
+ if (key->alg != alg) {
+ freealg(key);
+ noalg(key);
+
+ if (key->valuelen < alg->key_min) return staticerr(ip, "key too short");
+ if (key->valuelen > alg->key_max) return staticerr(ip, "key too long");
+ key->alg= alg;
+ }
+
+ schedp= (alg->decrypt.make_schedule!=alg->encrypt.make_schedule
+ && !encrypt) ? &key->decrypt : &key->encrypt;
+ sched= *schedp;
+ if (!sched) {
+ sched= TALLOC(alg->schedule_size);
+ (encrypt ? &alg->encrypt : &alg->decrypt)->make_schedule
+ (sched, key->value, key->valuelen);
+ *schedp= sched;
+ }
+
+ want_bufferslen= alg->blocksize * (mode->buf_blocks + mode->iv_blocks);
+ if (key->bufferslen < want_bufferslen) {
+ TFREE(key->buffers);
+ key->buffers= TALLOC(want_bufferslen);
+ key->bufferslen= want_bufferslen;
+ }
+
+ iv_want= alg->blocksize * mode->iv_blocks;
+ if (hbytes_issentinel(&iv)) {
+ if (!encrypt) return staticerr(ip,"must supply iv when decrypting");
+ rc= get_urandom(ip, key->buffers, iv_want);
+ if (rc) return rc;
+ } else {
+ int iv_supplied= hbytes_len(&iv);
+ if (iv_supplied > iv_want)
+ return staticerr(ip, "iv too large for algorithm and mode");
+ memcpy(key->buffers, hbytes_data(&iv), iv_supplied);
+ memset(key->buffers + iv_supplied, 0, iv_want - iv_supplied);
+ }
+
+ data_len= hbytes_len(v.hb);
+ if (data_len % alg->blocksize)
+ return staticerr(ip, "block cipher input not whole number of blocks");
+
+ failure=
+ (encrypt ? mode->encrypt : mode->decrypt)
+ (hbytes_data(v.hb), data_len / alg->blocksize,
+ key->buffers, key->buffers + iv_want,
+ alg, encrypt,
+ alg->blocksize, sched);
+
+ if (failure)
+ return staticerr(ip, failure);
+
+ hbytes_array(result, key->buffers, iv_want);
+
+ return TCL_OK;
+}
}
int hbytes_issentinel(const HBytes_Value *hb) {
- return HBYTES_ISCOMPLEX(hb);
+ return HBYTES_ISSENTINEL(hb);
}
/* constructors */
*
* hbytes pkcs5 pa|ua VAR ALG => worked? (always 1 for p)
* hbytes pkcs5 pn|un VAR BLOCKSIZE => worked? (always 1 for p)
- * hbytes blockcipher d|e VAR ALG MODE [IV] => IV
+ * hbytes blockcipher d|e VAR ALG KEY MODE [IV] => IV
*
* hbytes hash ALG MESSAGE => hash
* hbytes hmac ALG MESSAGE KEY [MACLENGTH] => mac
int staticerr(Tcl_Interp *ip, const char *m);
void objfreeir(Tcl_Obj *o);
+void obj_updatestr_array(Tcl_Obj *o, const Byte *array, int l);
+int get_urandom(Tcl_Interp *ip, Byte *buffer, int l);
/* from parse.c */
int pad, use_algname;
} PadMethod;
+Tcl_ObjType blockcipherkey_type;
+
/* from hash.c */
typedef struct {
/*
*/
+#include <errno.h>
+
#include "hbytes.h"
#include "tables.h"
return TCL_ERROR;
}
+int posixerr(Tcl_Interp *ip, int errnoval, const char *m) {
+ const char *em;
+
+ Tcl_ResetResult(ip);
+ errno= errnoval;
+ em= Tcl_PosixError(ip);
+ Tcl_AppendResult(ip, m, ": ", em, (char*)0);
+ return TCL_ERROR;
+}
+
void objfreeir(Tcl_Obj *o) {
if (o->typePtr && o->typePtr->freeIntRepProc)
o->typePtr->freeIntRepProc(o);
}
int do_hbytes_rep_info(ClientData cd, Tcl_Interp *ip,
- HBytes_Value v, Tcl_Obj **result) {
+ Tcl_Obj *obj, Tcl_Obj **result) {
const char *tn;
- int nums[3], i;
+ int nums[3], i, lnl;
Tcl_Obj *objl[4];
- memset(nums,0,sizeof(nums));
- nums[1]= hbytes_len(&v);
+ if (obj->typePtr == &hbytes_type) {
+ HBytes_Value *v= OBJ_HBYTES(obj);
+ memset(nums,0,sizeof(nums));
+ nums[1]= hbytes_len(v);
- if (HBYTES_ISEMPTY(&v)) tn= "empty";
- else if (HBYTES_ISSENTINEL(&v)) tn= "sentinel!";
- else if (HBYTES_ISSIMPLE(&v)) tn= "simple";
- else {
- HBytes_ComplexValue *cx= v.begin_complex;
- tn= "complex";
- nums[0]= cx->prespace;
- nums[2]= cx->avail - cx->len;
+ if (HBYTES_ISEMPTY(v)) tn= "empty";
+ else if (HBYTES_ISSENTINEL(v)) tn= "sentinel!";
+ else if (HBYTES_ISSIMPLE(v)) tn= "simple";
+ else {
+ HBytes_ComplexValue *cx= v->begin_complex;
+ tn= "complex";
+ nums[0]= cx->prespace;
+ nums[2]= cx->avail - cx->len;
+ }
+ lnl= 3;
+ } else {
+ tn= "other";
+ lnl= 0;
}
objl[0]= Tcl_NewStringObj((char*)tn,-1);
- for (i=0; i<3; i++) objl[i+1]= Tcl_NewIntObj(nums[i]);
- *result= Tcl_NewListObj(4,objl);
+ for (i=0; i<lnl; i++) objl[i+1]= Tcl_NewIntObj(nums[i]);
+ *result= Tcl_NewListObj(lnl+1,objl);
+
return TCL_OK;
}
hbytes_free(OBJ_HBYTES(o));
}
-static void hbytes_t_ustr(Tcl_Obj *o) {
- int l;
+void obj_updatestr_array(Tcl_Obj *o, const Byte *byte, int l) {
char *str;
- const Byte *byte;
- byte= hbytes_data(OBJ_HBYTES(o));
- l= hbytes_len(OBJ_HBYTES(o));
str= o->bytes= TALLOC(l*2+1);
o->length= l*2;
while (l>0) {
*str= 0;
}
+static void hbytes_t_ustr(Tcl_Obj *o) {
+ obj_updatestr_array(o,
+ hbytes_data(OBJ_HBYTES(o)),
+ hbytes_len(OBJ_HBYTES(o)));
+}
+
static int hbytes_t_sfa(Tcl_Interp *ip, Tcl_Obj *o) {
char *str, *ep, *os;
Byte *startbytes, *bytes;
return subcmd->func(0,ip,objc,objv);
}
+#define URANDOM "/dev/urandom"
+
+int get_urandom(Tcl_Interp *ip, Byte *buffer, int l) {
+ static FILE *urandom;
+
+ int r, esave;
+
+ if (!urandom) {
+ urandom= fopen(URANDOM,"rb");
+ if (!urandom) return posixerr(ip,errno,"open " URANDOM);
+ }
+ r= fread(buffer,1,l,urandom);
+ if (r==l) return 0;
+
+ esave= errno;
+ fclose(urandom); urandom=0;
+
+ if (ferror(urandom)) {
+ return posixerr(ip,errno,"read " URANDOM);
+ } else {
+ assert(feof(urandom));
+ return staticerr(ip, URANDOM " gave eof!");
+ }
+}
+
int Hbytes_Init(Tcl_Interp *ip) {
Tcl_RegisterObjType(&hbytes_type);
+ Tcl_RegisterObjType(&blockcipherkey_type);
Tcl_RegisterObjType(&enum_nearlytype);
Tcl_RegisterObjType(&enum1_nearlytype);
Tcl_CreateObjCommand(ip,"hbytes", pa__hbytes,0,0);
~ian / chiark-tcl.git / commitdiff