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 @@ | |||
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include "includes.h" | 14 | #include "includes.h" |
15 | RCSID("$Id: cipher.c,v 1.9 1999/12/12 21:27:33 damien Exp $"); | 15 | RCSID("$Id: cipher.c,v 1.10 1999/12/14 22:06:28 damien Exp $"); |
16 | 16 | ||
17 | #include "ssh.h" | 17 | #include "ssh.h" |
18 | #include "cipher.h" | 18 | #include "cipher.h" |
@@ -48,13 +48,13 @@ SSH_3CBC_ENCRYPT(des_key_schedule ks1, | |||
48 | memcpy(&iv1, iv2, 8); | 48 | memcpy(&iv1, iv2, 8); |
49 | 49 | ||
50 | des_cbc_encrypt(src, dest, len, ks1, &iv1, DES_ENCRYPT); | 50 | des_cbc_encrypt(src, dest, len, ks1, &iv1, DES_ENCRYPT); |
51 | memcpy(&iv1, dest + len - 8, 8); | 51 | memcpy(&iv1, (char *)dest + len - 8, 8); |
52 | 52 | ||
53 | des_cbc_encrypt(dest, dest, len, ks2, iv2, DES_DECRYPT); | 53 | des_cbc_encrypt(dest, dest, len, ks2, iv2, DES_DECRYPT); |
54 | memcpy(iv2, &iv1, 8); /* Note how iv1 == iv2 on entry and exit. */ | 54 | memcpy(iv2, &iv1, 8); /* Note how iv1 == iv2 on entry and exit. */ |
55 | 55 | ||
56 | des_cbc_encrypt(dest, dest, len, ks3, iv3, DES_ENCRYPT); | 56 | des_cbc_encrypt(dest, dest, len, ks3, iv3, DES_ENCRYPT); |
57 | memcpy(iv3, dest + len - 8, 8); | 57 | memcpy(iv3, (char *)dest + len - 8, 8); |
58 | } | 58 | } |
59 | 59 | ||
60 | void | 60 | void |
@@ -69,10 +69,10 @@ SSH_3CBC_DECRYPT(des_key_schedule ks1, | |||
69 | memcpy(&iv1, iv2, 8); | 69 | memcpy(&iv1, iv2, 8); |
70 | 70 | ||
71 | des_cbc_encrypt(src, dest, len, ks3, iv3, DES_DECRYPT); | 71 | des_cbc_encrypt(src, dest, len, ks3, iv3, DES_DECRYPT); |
72 | memcpy(iv3, src + len - 8, 8); | 72 | memcpy(iv3, (char *)src + len - 8, 8); |
73 | 73 | ||
74 | des_cbc_encrypt(dest, dest, len, ks2, iv2, DES_ENCRYPT); | 74 | des_cbc_encrypt(dest, dest, len, ks2, iv2, DES_ENCRYPT); |
75 | memcpy(iv2, dest + len - 8, 8); | 75 | memcpy(iv2, (char *)dest + len - 8, 8); |
76 | 76 | ||
77 | des_cbc_encrypt(dest, dest, len, ks1, &iv1, DES_DECRYPT); | 77 | des_cbc_encrypt(dest, dest, len, ks1, &iv1, DES_DECRYPT); |
78 | /* memcpy(&iv1, iv2, 8); */ | 78 | /* memcpy(&iv1, iv2, 8); */ |