From c4e42a74ef4c74481477fc43eeb83c2cdc3ef3e4 Mon Sep 17 00:00:00 2001 From: Theodore Tso Date: Fri, 9 Jun 1995 23:20:47 +0000 Subject: [PATCH] Fix -Wall nits git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6018 dc483132-0cff-0310-8789-dd5450dbe970 --- src/lib/crypto/ChangeLog | 2 ++ src/lib/crypto/des_crc.c | 20 ++++++++++---------- src/lib/crypto/des_md5.c | 20 ++++++++++---------- 3 files changed, 22 insertions(+), 20 deletions(-) diff --git a/src/lib/crypto/ChangeLog b/src/lib/crypto/ChangeLog index f09c8887d..baf67fbd7 100644 --- a/src/lib/crypto/ChangeLog +++ b/src/lib/crypto/ChangeLog @@ -1,5 +1,7 @@ Fri Jun 9 18:52:19 1995 + * des_crc.c, des_md5.c: Fix -Wall nits. + * configure.in: Remove standardized set of autoconf macros, which are now handled by CONFIG_RULES. Use DO_SUBDIRS to recurse down subdirectories. diff --git a/src/lib/crypto/des_crc.c b/src/lib/crypto/des_crc.c index b0f3f1ff4..75bf94d81 100644 --- a/src/lib/crypto/des_crc.c +++ b/src/lib/crypto/des_crc.c @@ -91,7 +91,7 @@ mit_des_crc_encrypt_func(in, out, size, key, ivec) memset((char *)out, 0, sumsize); /* put in the confounder */ - if (retval = krb5_random_confounder(sizeof(mit_des_cblock), out)) + if ((retval = krb5_random_confounder(sizeof(mit_des_cblock), out))) return retval; memcpy((char *)out+sizeof(mit_des_cblock)+CRC32_CKSUM_LENGTH, (char *)in, @@ -102,11 +102,11 @@ mit_des_crc_encrypt_func(in, out, size, key, ivec) /* This is equivalent to krb5_calculate_checksum(CKSUMTYPE_CRC32,...) but avoids use of the cryptosystem config table which can not be referenced here if this object is to be included in a shared library. */ - if (retval = crc32_cksumtable_entry.sum_func((krb5_pointer) out, - sumsize, - (krb5_pointer)key->key->contents, - sizeof(mit_des_cblock), - &cksum)) + if ((retval = crc32_cksumtable_entry.sum_func((krb5_pointer) out, + sumsize, + (krb5_pointer)key->key->contents, + sizeof(mit_des_cblock), + &cksum))) return retval; memcpy((char *)out+sizeof(mit_des_cblock), (char *)contents, @@ -154,10 +154,10 @@ mit_des_crc_decrypt_func(in, out, size, key, ivec) memcpy((char *)contents_get, p, CRC32_CKSUM_LENGTH); memset(p, 0, CRC32_CKSUM_LENGTH); - if (retval = crc32_cksumtable_entry.sum_func(out, size, - (krb5_pointer)key->key->contents, - sizeof(mit_des_cblock), - &cksum)) + if ((retval = crc32_cksumtable_entry.sum_func(out, size, + (krb5_pointer)key->key->contents, + sizeof(mit_des_cblock), + &cksum))) return retval; if (memcmp((char *)contents_get, (char *)contents_prd, CRC32_CKSUM_LENGTH) ) diff --git a/src/lib/crypto/des_md5.c b/src/lib/crypto/des_md5.c index e0c80a746..7b846e0f3 100644 --- a/src/lib/crypto/des_md5.c +++ b/src/lib/crypto/des_md5.c @@ -92,7 +92,7 @@ mit_des_md5_encrypt_func(in, out, size, key, ivec) memset((char *)out, 0, sumsize); /* put in the confounder */ - if (retval = krb5_random_confounder(sizeof(mit_des_cblock), out)) + if ((retval = krb5_random_confounder(sizeof(mit_des_cblock), out))) return retval; memcpy((char *)out+sizeof(mit_des_cblock)+RSA_MD5_CKSUM_LENGTH, (char *)in, @@ -103,11 +103,11 @@ mit_des_md5_encrypt_func(in, out, size, key, ivec) /* This is equivalent to krb5_calculate_checksum(CKSUMTYPE_MD5,...) but avoids use of the cryptosystem config table which can not be referenced here if this object is to be included in a shared library. */ - if (retval = rsa_md5_cksumtable_entry.sum_func((krb5_pointer) out, - sumsize, - (krb5_pointer)key->key->contents, - sizeof(mit_des_cblock), - &cksum)) + if ((retval = rsa_md5_cksumtable_entry.sum_func((krb5_pointer) out, + sumsize, + (krb5_pointer)key->key->contents, + sizeof(mit_des_cblock), + &cksum))) return retval; memcpy((char *)out+sizeof(mit_des_cblock), (char *)contents, @@ -155,10 +155,10 @@ mit_des_md5_decrypt_func(in, out, size, key, ivec) memcpy((char *)contents_get, p, RSA_MD5_CKSUM_LENGTH); memset(p, 0, RSA_MD5_CKSUM_LENGTH); - if (retval = rsa_md5_cksumtable_entry.sum_func(out, size, - (krb5_pointer)key->key->contents, - sizeof(mit_des_cblock), - &cksum)) + if ((retval = rsa_md5_cksumtable_entry.sum_func(out, size, + (krb5_pointer)key->key->contents, + sizeof(mit_des_cblock), + &cksum))) return retval; if (memcmp((char *)contents_get, (char *)contents_prd, RSA_MD5_CKSUM_LENGTH) ) -- 2.26.2