r4278@bucket (orig r268): kcr | 2008-01-21 13:01:29 -0500

 cast args to des_ecb_encrypt and des_quad_cksum to squash last warnings

git-svn-id: svn://svn.1ts.org/debian/trunk@340 cbed1d16-5ef5-0310-b6a1-d4a37b08ba1f

diff --git a/zephyr/lib/ZCkZAut.c b/zephyr/lib/ZCkZAut.c
index a3d06f9a0aafb45e17bacce31087664cc0dfc731..7411bd63413f9d227f2cfaf858ba7f68a4eb8b11 100644 (file)
--- a/zephyr/lib/ZCkZAut.c
+++ b/zephyr/lib/ZCkZAut.c
@@ -121,7 +121,7 @@ Code_t ZCheckZcodeAuthentication(ZNotice_t *notice,
             ZChecksum_t our_checksum;
 
             our_checksum = des_quad_cksum((unsigned char *)cksum0_base, NULL, cksum0_len, 0,
-                                          key_data);
+                                          (C_Block *)key_data);
             if (our_checksum == notice->z_checksum) {
                 krb5_free_creds(Z_krb5_ctx, creds);
                 return ZAUTH_YES;

diff --git a/zephyr/lib/ZFmtAuth.c b/zephyr/lib/ZFmtAuth.c
index ba647429d3a16948f15ad54bde6286e20f7a6a04..21b133b6480e5572e8c268f3761ed7f5b588bdce 100644 (file)
--- a/zephyr/lib/ZFmtAuth.c
+++ b/zephyr/lib/ZFmtAuth.c
@@ -41,7 +41,7 @@ ZFormatAuthenticNotice(ZNotice_t *notice,
     newnotice.z_checksum = 0;
 #else
     newnotice.z_checksum =
-       (ZChecksum_t)des_quad_cksum((unsigned char *)buffer, NULL, ptr - buffer, 0, session);
+       (ZChecksum_t)des_quad_cksum((unsigned char *)buffer, NULL, ptr - buffer, 0, (C_Block *)session);
 #endif
     if ((retval = Z_FormatRawHeader(&newnotice, buffer, buffer_len,
                                    &hdrlen, NULL, NULL)) != ZERR_NONE)

diff --git a/zephyr/server/bdump.c b/zephyr/server/bdump.c
index 63fbe9cf17dbf80fe73a91d1fada9f0a68e8a300..233ff0c0bc5a3c735e3ae72c4a86f3978bf5462f 100644 (file)
--- a/zephyr/server/bdump.c
+++ b/zephyr/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/zephyr/server/kstuff.c b/zephyr/server/kstuff.c
index 6275e16ff71aa254c7757f2102ab2aa5a4ce2b0f..5501e12f1b093e592082dfddd005056f64a78baa 100644 (file)
--- a/zephyr/server/kstuff.c
+++ b/zephyr/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/zephyr/server/subscr.c b/zephyr/server/subscr.c
index c67bc8956e73a24cf7e545417f13ac930fb7cd63..f5d8e5e113b29af61c15a6f608f59a9d2c50edf2 100644 (file)
--- a/zephyr/server/subscr.c
+++ b/zephyr/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