} else {
rc= Tcl_GetIntFromObj(ip, block, &blocksize); if (rc) return rc;
if (blocksize < 1 || blocksize > 255)
- return staticerr(ip, "block size out of pkcs#5 range 1..255");
+ return staticerr(ip, "block size out of pkcs#5 range 1..255", 0);
}
if (meth->pad) {
memcpy(dup->value, src->value, src->valuelen);
noalg(dup);
dup_obj->internalRep.otherValuePtr= dup;
+ dup_obj->typePtr= &blockcipherkey_type;
}
static void key_t_ustr(Tcl_Obj *o) {
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;
+int do_hbytes_blockcipher(ClientData cd, Tcl_Interp *ip,
+ const BlockCipherOp *op,
+ int objc, Tcl_Obj *const *objv) {
+ return op->func((void*)op,ip,objc,objv);
+}
+
+static int blockcipher_prep(Tcl_Interp *ip, Tcl_Obj *key_obj,
+ const HBytes_Value *iv, int decrypt,
+ const BlockCipherAlgInfo *alg,
+ const BlockCipherModeInfo *mode, int data_len,
+ const CiphKeyValue **key_r, const void **sched_r,
+ const Byte **iv_r, int *iv_lenbytes_r,
+ Byte **buffers_r, int *nblocks_r) {
void *sched, **schedp;
+ int want_bufferslen, want_iv;
+ int rc;
+ CiphKeyValue *key;
+
+ if (data_len % alg->blocksize)
+ return staticerr(ip, "block cipher input not whole number of blocks",
+ "HBYTES BLOCKCIPHER LENGTH");
want_bufferslen= alg->blocksize * (mode->buf_blocks + mode->iv_blocks);
- key= get_key(ip, key_obj, alg, want_bufferslen);
+ 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;
+ || !decrypt) ? &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");
+ if (key->valuelen < alg->key_min)
+ return staticerr(ip, "key too short", "HBYTES BLOCKCIPHER PARAMS");
+ if (key->valuelen > alg->key_max)
+ return staticerr(ip, "key too long", "HBYTES BLOCKCIPHER PARAMS");
sched= TALLOC(alg->schedule_size);
- (encrypt ? &alg->encrypt : &alg->decrypt)->make_schedule
+ (decrypt ? &alg->decrypt : &alg->encrypt)->make_schedule
(sched, key->value, key->valuelen);
*schedp= sched;
}
- 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);
+ want_iv= alg->blocksize * mode->iv_blocks;
+ if (!want_iv) {
+ if (!hbytes_issentinel(iv))
+ return staticerr(ip,"iv supplied but mode does not take one", 0);
+ } else if (hbytes_issentinel(iv)) {
+ if (decrypt) return staticerr(ip,"must supply iv when decrypting", 0);
+ rc= get_urandom(ip, key->buffers, want_iv);
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);
+ int iv_supplied= hbytes_len(iv);
+ if (iv_supplied > want_iv)
+ return staticerr(ip, "iv too large for algorithm and mode",
+ "HBYTES BLOCKCIPHER PARAMS");
+ memcpy(key->buffers, hbytes_data(iv), iv_supplied);
+ memset(key->buffers + iv_supplied, 0, want_iv - iv_supplied);
}
- data_len= hbytes_len(v.hb);
- if (data_len % alg->blocksize)
- return staticerr(ip, "block cipher input not whole number of blocks");
+ *key_r= key;
+ *sched_r= sched;
+
+ *iv_r= key->buffers;
+ *iv_lenbytes_r= want_iv;
+
+ *buffers_r= key->buffers + want_iv;
+ *nblocks_r= data_len / alg->blocksize;
+
+ return TCL_OK;
+}
+
+int do_blockcipherop_d(ClientData cd, Tcl_Interp *ip,
+ HBytes_Var v, const BlockCipherAlgInfo *alg,
+ Tcl_Obj *key_obj, const BlockCipherModeInfo *mode,
+ HBytes_Value iv, HBytes_Value *result) {
+ return do_blockcipherop_e(cd,ip,v,alg,key_obj,mode,iv,result);
+}
+int do_blockcipherop_e(ClientData cd, Tcl_Interp *ip,
+ HBytes_Var v, const BlockCipherAlgInfo *alg,
+ Tcl_Obj *key_obj, const BlockCipherModeInfo *mode,
+ HBytes_Value iv, HBytes_Value *result) {
+ const BlockCipherOp *op= (const void*)cd;
+ int encrypt= op->encrypt;
+ int rc, iv_lenbytes;
+ const CiphKeyValue *key;
+ const char *failure;
+ const Byte *ivbuf;
+ Byte *buffers;
+ const void *sched;
+ int nblocks;
+
+ if (!mode->encrypt)
+ return staticerr(ip, "mode does not support encrypt/decrypt", 0);
+
+ rc= blockcipher_prep(ip,key_obj,&iv,!encrypt,
+ alg,mode, hbytes_len(v.hb),
+ &key,&sched,
+ &ivbuf,&iv_lenbytes,
+ &buffers,&nblocks);
+ if (rc) return rc;
+
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);
+ (hbytes_data(v.hb), nblocks, ivbuf, buffers, alg, encrypt, sched);
if (failure)
- return staticerr(ip, failure);
+ return staticerr(ip, failure, "HBYTES BLOCKCIPHER CRYPTFAIL CRYPT");
- hbytes_array(result, key->buffers, iv_want);
+ hbytes_array(result, ivbuf, iv_lenbytes);
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_blockcipherop_mac(ClientData cd, Tcl_Interp *ip,
+ HBytes_Value msg, const BlockCipherAlgInfo *alg,
+ Tcl_Obj *key_obj, const BlockCipherModeInfo *mode,
+ HBytes_Value iv, HBytes_Value *result) {
+ const CiphKeyValue *key;
+ const char *failure;
+ const Byte *ivbuf;
+ Byte *buffers;
+ const void *sched;
+ int nblocks, iv_lenbytes;
+ int rc;
+
+ if (!mode->mac)
+ return staticerr(ip, "mode does not support mac generation", 0);
+
+ rc= blockcipher_prep(ip,key_obj,&iv,0,
+ alg,mode, hbytes_len(&msg),
+ &key,&sched,
+ &ivbuf,&iv_lenbytes,
+ &buffers,&nblocks);
+ if (rc) return rc;
+
+ failure= mode->mac(hbytes_data(&msg), nblocks, ivbuf, buffers, alg, sched);
+ if (failure)
+ return staticerr(ip,failure, "HBYTES BLOCKCIPHER CRYPTFAIL MAC");
+
+ hbytes_array(result, buffers, alg->blocksize * mode->mac_blocks);
+
+ return TCL_OK;
}
int do_hbytes_hmac(ClientData cd, Tcl_Interp *ip, const HashAlgInfo *alg,
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");
+ return staticerr(ip, "requested hmac output size out of range",
+ "HBYTES HMAC PARAMS");
} else {
ml= alg->hashsize;
}
assert(!key->beta);
if (key->valuelen > alg->blocksize)
- return staticerr(ip, "key to hmac longer than hash block size");
+ return staticerr(ip, "key to hmac longer than hash block size",
+ "HBYTES HMAC PARAMS");
-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);
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);
~ian / chiark-tcl.git / blobdiff