static const char *mode_cbc_encrypt(Byte *data, int blocks,
const Byte *iv, Byte *chain,
const BlockCipherAlgInfo *alg, int encr,
- int blocksize, const void *sch) {
+ const void *sch) {
+ int blocksize= alg->blocksize;
memcpy(chain,iv,blocksize);
alg->byteswap(chain);
static const char *mode_cbc_decrypt(Byte *data, int blocks,
const Byte *iv, Byte *chain,
const BlockCipherAlgInfo *alg, int encr,
- int blocksize, const void *sch) {
+ const void *sch) {
+ int blocksize= alg->blocksize;
int cchain= 0;
memcpy(chain,iv,blocksize);
return 0;
}
+static void cbcmac_core(const Byte *data, int blocks,
+ const Byte *iv, Byte *buf,
+ const BlockCipherAlgInfo *alg,
+ const void *sch) {
+ int blocksize= alg->blocksize;
+
+ memcpy(buf,iv,blocksize);
+ alg->byteswap(buf);
+
+ while (blocks > 0) {
+ memcpy(buf + blocksize, data, blocksize);
+ alg->byteswap(buf + blocksize);
+ memxor(buf, buf + blocksize, blocksize);
+
+ alg->encrypt.crypt(sch, buf, buf);
+
+ blocks--; data += blocksize;
+ }
+}
+
+static const char *mode_cbc_mac(const Byte *data, int blocks,
+ const Byte *iv, Byte *buf,
+ const BlockCipherAlgInfo *alg,
+ const void *sch) {
+ cbcmac_core(data,blocks,iv,buf,alg,sch);
+ alg->byteswap(buf);
+ return 0;
+}
+
+static const char *mode_cbc_mac2(const Byte *data, int blocks,
+ const Byte *iv, Byte *buf,
+ const BlockCipherAlgInfo *alg,
+ const void *sch) {
+ cbcmac_core(data,blocks,iv,buf,alg,sch);
+ alg->encrypt.crypt(sch, buf, buf);
+ alg->byteswap(buf);
+ return 0;
+}
+
static const char *mode_ecb(Byte *data, int blocks,
const Byte *iv, Byte *chain,
const BlockCipherAlgInfo *alg, int encr,
- int blocksize, const void *sch) {
+ const void *sch) {
+ int blocksize= alg->blocksize;
+
while (blocks > 0) {
alg->byteswap(data);
(encr ? &alg->encrypt : &alg->decrypt)->crypt(sch, data, data);
}
const BlockCipherModeInfo blockciphermodeinfos[]= {
- { "cbc", 1, 2, mode_cbc_encrypt, mode_cbc_decrypt },
- { "ecb", 0, 0, mode_ecb, mode_ecb },
+ { "cbc", 1, 2, 1, mode_cbc_encrypt, mode_cbc_decrypt, mode_cbc_mac },
+ { "cbc-mac2", 1, 2, 1, 0, 0, mode_cbc_mac2 },
+ { "ecb", 0, 0, 0, mode_ecb, mode_ecb, 0 },
{ 0 }
};