From 41ff7485d2775407c85fb2b90b26c3170b2ad4b5 Mon Sep 17 00:00:00 2001 From: Ken Raeburn Date: Sat, 22 Jan 2000 03:49:56 +0000 Subject: Various changes to: * make most non-changing data const * silence "gcc -Wall -Werror" complaints on sparc-solaris2.6 ** delete unused functions and variables ** change if(a=b) ... to if((a=b)) or if((a=b)!=0) [yeah, kinda gratuitous] ** insert extra braces for 2-D arrays * some basic thread safety checks Not changing afsstring2key.c until I make sure I've got some tests for it. Currently, prng.c and afsstring2key.c, at least, still aren't thread-safe. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@11959 dc483132-0cff-0310-8789-dd5450dbe970 --- src/lib/crypto/old/old_decrypt.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/lib/crypto/old/old_decrypt.c') diff --git a/src/lib/crypto/old/old_decrypt.c b/src/lib/crypto/old/old_decrypt.c index 2d22648e2..1bcb0d38b 100644 --- a/src/lib/crypto/old/old_decrypt.c +++ b/src/lib/crypto/old/old_decrypt.c @@ -45,7 +45,7 @@ krb5_old_decrypt(enc, hash, key, usage, ivec, input, arg_output) { krb5_error_code ret; size_t blocksize, hashsize, plainsize; - unsigned char *plaintext, *cksumdata; + unsigned char *cksumdata; krb5_data output, cksum, crcivec; int alloced; @@ -89,7 +89,7 @@ krb5_old_decrypt(enc, hash, key, usage, ivec, input, arg_output) ivec = &crcivec; } - if (ret = ((*(enc->decrypt))(key, ivec, input, &output))) + if ((ret = ((*(enc->decrypt))(key, ivec, input, &output)))) goto cleanup; /* verify the checksum */ @@ -100,7 +100,7 @@ krb5_old_decrypt(enc, hash, key, usage, ivec, input, arg_output) cksum.length = hashsize; cksum.data = output.data+blocksize; - if (ret = ((*(hash->hash))(1, &output, &cksum))) + if ((ret = ((*(hash->hash))(1, &output, &cksum)))) goto cleanup; if (memcmp(cksum.data, cksumdata, cksum.length) != 0) { @@ -131,4 +131,3 @@ cleanup: free(cksumdata); return(ret); } - -- cgit