summaryrefslogtreecommitdiff
path: root/server
diff options
context:
space:
mode:
authorGravatar Karl Ramm <kcr@mit.edu>2008-01-21 18:01:29 +0000
committerGravatar Karl Ramm <kcr@mit.edu>2008-01-21 18:01:29 +0000
commit125183b2bce6874c2eca34f1a0253de32e9c957a (patch)
tree27dd2b5990979464d012ea96ebc527a309becfc9 /server
parentea96ccd1f26e7317e37d69d9d81943090d3f6488 (diff)
cast args to des_ecb_encrypt and des_quad_cksum to squash last warnings
Diffstat (limited to 'server')
-rw-r--r--server/bdump.c2
-rw-r--r--server/kstuff.c8
-rw-r--r--server/subscr.c2
3 files changed, 6 insertions, 6 deletions
diff --git a/server/bdump.c b/server/bdump.c
index a3a684f..4f5b5d5 100644
--- a/server/bdump.c
+++ b/server/bdump.c
@@ -1258,7 +1258,7 @@ bdump_recv_loop(Server *server)
syslog(LOG_ERR,"brl bad cblk read: %s (%s)",
error_message(retval), cp);
} else {
- des_ecb_encrypt(cblock, Z_keydata(client->session_keyblock),
+ des_ecb_encrypt((C_Block *)cblock, (C_Block *)Z_keydata(client->session_keyblock),
serv_ksched.s, DES_DECRYPT);
}
} else if (*cp == 'Z') { /* Zcode! Long live the new flesh! */
diff --git a/server/kstuff.c b/server/kstuff.c
index 28492ee..63d1f1c 100644
--- a/server/kstuff.c
+++ b/server/kstuff.c
@@ -880,10 +880,10 @@ compute_checksum(ZNotice_t *notice,
cstart = notice->z_default_format + strlen(notice->z_default_format) + 1;
cend = cstart + strlen(cstart) + 1;
- checksum = des_quad_cksum((unsigned char *)hstart, NULL, cstart - hstart, 0, session_key);
- checksum ^= des_quad_cksum((unsigned char *)cend, NULL, hend - cend, 0, session_key);
+ checksum = des_quad_cksum((unsigned char *)hstart, NULL, cstart - hstart, 0, (C_Block *)session_key);
+ checksum ^= des_quad_cksum((unsigned char *)cend, NULL, hend - cend, 0, (C_Block *)session_key);
checksum ^= des_quad_cksum((unsigned char *)notice->z_message, NULL, notice->z_message_len,
- 0, session_key);
+ 0, (C_Block *)session_key);
return checksum;
#endif
}
@@ -899,7 +899,7 @@ static ZChecksum_t compute_rlm_checksum(ZNotice_t *notice,
cstart = notice->z_default_format + strlen(notice->z_default_format) + 1;
cend = cstart + strlen(cstart) + 1;
- checksum = des_quad_cksum((unsigned char *)hstart, NULL, cstart - hstart, 0, session_key);
+ checksum = des_quad_cksum((unsigned char *)hstart, NULL, cstart - hstart, 0, (C_Block *)session_key);
return checksum;
#endif
}
diff --git a/server/subscr.c b/server/subscr.c
index ab67f33..8ed6189 100644
--- a/server/subscr.c
+++ b/server/subscr.c
@@ -852,7 +852,7 @@ subscr_send_subs(Client *client)
syslog(LOG_WARNING, "subscr_send_subs: cannot allocate memory for DES keyblock: %m");
return errno;
}
- des_ecb_encrypt(Z_keydata(client->session_keyblock), bufp, serv_ksched.s, DES_ENCRYPT);
+ des_ecb_encrypt((C_Block *)Z_keydata(client->session_keyblock), (C_Block *)bufp, serv_ksched.s, DES_ENCRYPT);
retval = ZMakeAscii(buf, sizeof(buf), bufp, Z_keylen(client->session_keyblock));
} else {
#endif