return TCL_OK;
}
+int do_hbytes_hash(ClientData cd, Tcl_Interp *ip, const HashAlgInfo *alg,
+ HBytes_Value message, HBytes_Value *result) {
+ Byte *dest;
+
+ dest= hbytes_arrayspace(result,alg->hashsize);
+ alg->oneshot(dest, hbytes_data(&message), hbytes_len(&message));
+ 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 */
+ const void *alg;
+ void *alpha, *beta; /* key schedules etc.; each may be 0 */
} CiphKeyValue;
static void freealg(CiphKeyValue *key) {
- TFREE(key->encrypt);
- TFREE(key->decrypt);
+ TFREE(key->alpha);
+ TFREE(key->beta);
}
static void key_t_free(Tcl_Obj *obj) {
static void noalg(CiphKeyValue *key) {
key->alg= 0;
- key->encrypt= key->decrypt= 0;
+ key->alpha= key->beta= 0;
}
static void key_t_dup(Tcl_Obj *src_obj, Tcl_Obj *dup_obj) {
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;
+static CiphKeyValue *get_key(Tcl_Interp *ip, Tcl_Obj *key_obj,
+ const void *alg, int want_bufferslen) {
CiphKeyValue *key;
- const char *failure;
- void *sched, **schedp;
-
- rc= Tcl_ConvertToType(ip,key_obj,&blockcipherkey_type); if (rc) return rc;
+ int rc;
+
+ rc= Tcl_ConvertToType(ip,key_obj,&blockcipherkey_type); if (rc) return 0;
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;
}
+
+ if (key->bufferslen < want_bufferslen) {
+ TFREE(key->buffers);
+ key->buffers= TALLOC(want_bufferslen);
+ key->bufferslen= want_bufferslen;
+ }
+ return key;
+}
+
+int do_hbytes_blockcipher(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;
- schedp= (alg->decrypt.make_schedule!=alg->encrypt.make_schedule
- && !encrypt) ? &key->decrypt : &key->encrypt;
+ want_bufferslen= alg->blocksize * (mode->buf_blocks + mode->iv_blocks);
+ key= get_key(ip, key_obj, alg, want_bufferslen); if (!key) return TCL_ERROR;
+
+ schedp= (alg->decrypt.make_schedule==alg->encrypt.make_schedule
+ || encrypt) ? &key->alpha : &key->beta;
sched= *schedp;
if (!sched) {
+ if (key->valuelen < alg->key_min) return staticerr(ip, "key too short");
+ if (key->valuelen > alg->key_max) return staticerr(ip, "key too long");
+
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 (!iv_want) {
+ if (!hbytes_issentinel(&iv))
+ return staticerr(ip,"iv supplied but mode does not take one");
+ } else 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;
return TCL_OK;
}
+
+static void dbuf(const char *m, const Byte *a, int l) {
+ fprintf(stderr,"dbuf %s l=%d ",m,l);
+ while (l-->0) fprintf(stderr,"%02x",*a++);
+ putc('\n',stderr);
+}
+
+int do_hbytes_hmac(ClientData cd, Tcl_Interp *ip, const HashAlgInfo *alg,
+ HBytes_Value message, Tcl_Obj *key_obj,
+ Tcl_Obj *maclen_obj, HBytes_Value *result) {
+ /* key->alpha = state after H(K XOR ipad <unfinished>
+ * key->beta = state after H(K XOR opad <unfinished>
+ * key->buffers = room for one block, or one state
+ */
+ CiphKeyValue *key;
+ Byte *dest;
+ int i, ml, rc;
+
+ if (maclen_obj) {
+ rc= Tcl_GetIntFromObj(ip, maclen_obj, &ml); if (rc) return rc;
+ if (ml<0 || ml>alg->hashsize)
+ return staticerr(ip, "requested hmac output size out of range");
+ } else {
+ ml= alg->hashsize;
+ }
+
+ key= get_key(ip, key_obj, alg,
+ alg->blocksize > alg->statesize
+ ? alg->blocksize : alg->statesize);
+
+ if (!key->alpha) {
+ assert(!key->beta);
+
+ if (key->valuelen > alg->blocksize)
+ return staticerr(ip, "key to hmac longer than hash block size");
+
+dbuf("start key",key->value,key->valuelen);
+ memcpy(key->buffers, key->value, key->valuelen);
+ memset(key->buffers + key->valuelen, 0, alg->blocksize - key->valuelen);
+ for (i=0; i<alg->blocksize; i++) key->buffers[i] ^= 0x36;
+
+ key->alpha= TALLOC(alg->statesize);
+ alg->init(key->alpha);
+dbuf("inner key",key->buffers,alg->blocksize);
+ alg->update(key->alpha, key->buffers, alg->blocksize);
+
+ key->beta= TALLOC(alg->statesize);
+ alg->init(key->beta);
+ for (i=0; i<alg->blocksize; i++) key->buffers[i] ^= (0x5c ^ 0x36);
+ alg->update(key->beta, key->buffers, alg->blocksize);
+dbuf("inner key",key->buffers,alg->blocksize);
+ }
+ assert(key->beta);
+
+ dest= hbytes_arrayspace(result, alg->hashsize);
+
+ memcpy(key->buffers, key->alpha, alg->statesize);
+ alg->update(key->buffers, hbytes_data(&message), hbytes_len(&message));
+ alg->final(key->buffers, dest);
+dbuf("inner hash",dest,alg->hashsize);
+
+ memcpy(key->buffers, key->beta, alg->statesize);
+ alg->update(key->buffers, dest, alg->hashsize);
+ alg->final(key->buffers, dest);
+dbuf("outer hash",dest,alg->hashsize);
+
+ hbytes_unappend(result, alg->hashsize - ml);
+
+ return TCL_OK;
+}
~ian / chiark-tcl.git / blobdiff