diff options
| author | Damien Miller <djm@mindrot.org> | 1999-12-15 09:06:28 +1100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 1999-12-15 09:06:28 +1100 |
| commit | 84093e9d7407b64673d20b38a02bca432f970ba6 (patch) | |
| tree | 82839d5cf06598bbe4ca9365fd0291ce671e6bc9 /cipher.c | |
| parent | 6ae00d6c965e61fc394b8adb698e9d8c603bbe75 (diff) | |
- Integrated patchs from Juergen Keil <jk@tools.de>
- Avoid void* pointer arithmatic
- Use LDFLAGS correctly
Diffstat (limited to 'cipher.c')
| -rw-r--r-- | cipher.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -12,7 +12,7 @@ */ #include "includes.h" -RCSID("$Id: cipher.c,v 1.9 1999/12/12 21:27:33 damien Exp $"); +RCSID("$Id: cipher.c,v 1.10 1999/12/14 22:06:28 damien Exp $"); #include "ssh.h" #include "cipher.h" @@ -48,13 +48,13 @@ SSH_3CBC_ENCRYPT(des_key_schedule ks1, memcpy(&iv1, iv2, 8); des_cbc_encrypt(src, dest, len, ks1, &iv1, DES_ENCRYPT); - memcpy(&iv1, dest + len - 8, 8); + memcpy(&iv1, (char *)dest + len - 8, 8); des_cbc_encrypt(dest, dest, len, ks2, iv2, DES_DECRYPT); memcpy(iv2, &iv1, 8); /* Note how iv1 == iv2 on entry and exit. */ des_cbc_encrypt(dest, dest, len, ks3, iv3, DES_ENCRYPT); - memcpy(iv3, dest + len - 8, 8); + memcpy(iv3, (char *)dest + len - 8, 8); } void @@ -69,10 +69,10 @@ SSH_3CBC_DECRYPT(des_key_schedule ks1, memcpy(&iv1, iv2, 8); des_cbc_encrypt(src, dest, len, ks3, iv3, DES_DECRYPT); - memcpy(iv3, src + len - 8, 8); + memcpy(iv3, (char *)src + len - 8, 8); des_cbc_encrypt(dest, dest, len, ks2, iv2, DES_ENCRYPT); - memcpy(iv2, dest + len - 8, 8); + memcpy(iv2, (char *)dest + len - 8, 8); des_cbc_encrypt(dest, dest, len, ks1, &iv1, DES_DECRYPT); /* memcpy(&iv1, iv2, 8); */ |