oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

handle non blocksized cbc messages

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@13788 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2004-04-25 19:06:51 +00:00
parent 234befda59
commit 6357f48500
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/des/rc2.c
View File

@@ -204,7 +204,7 @@ RC2_cbc_encrypt(const unsigned char *in, unsigned char *out, long size,
int i; int i;
if (encrypt) { if (encrypt) {
while (size > 0) { while (size >= RC2_BLOCK_SIZE) {
for (i = 0; i < RC2_BLOCK_SIZE; i++) for (i = 0; i < RC2_BLOCK_SIZE; i++)
tmp[i] = in[i] ^ iv[i]; tmp[i] = in[i] ^ iv[i];
RC2_encryptc(tmp, out, key); RC2_encryptc(tmp, out, key);
@@ -213,8 +213,16 @@ RC2_cbc_encrypt(const unsigned char *in, unsigned char *out, long size,
in += RC2_BLOCK_SIZE; in += RC2_BLOCK_SIZE;
out += RC2_BLOCK_SIZE; out += RC2_BLOCK_SIZE;
} }
if (size) {
for (i = 0; i < size; i++)
tmp[i] = in[i] ^ iv[i];
for (i = size; i < RC2_BLOCK_SIZE; i++)
tmp[i] = iv[i];
RC2_encryptc(tmp, out, key);
memcpy(iv, out, RC2_BLOCK_SIZE);
}
} else { } else {
while (size > 0) { while (size >= RC2_BLOCK_SIZE) {
memcpy(tmp, in, RC2_BLOCK_SIZE); memcpy(tmp, in, RC2_BLOCK_SIZE);
RC2_decryptc(tmp, out, key); RC2_decryptc(tmp, out, key);
for (i = 0; i < RC2_BLOCK_SIZE; i++) for (i = 0; i < RC2_BLOCK_SIZE; i++)
@@ -224,5 +232,12 @@ RC2_cbc_encrypt(const unsigned char *in, unsigned char *out, long size,
in += RC2_BLOCK_SIZE; in += RC2_BLOCK_SIZE;
out += RC2_BLOCK_SIZE; out += RC2_BLOCK_SIZE;
} }
if (size) {
memcpy(tmp, in, RC2_BLOCK_SIZE);
RC2_decryptc(tmp, out, key);
for (i = 0; i < size; i++)
out[i] ^= iv[i];
memcpy(iv, tmp, RC2_BLOCK_SIZE);
}
} }
} }