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

4 files changed, 20 insertions, 7 deletions

diff --git a/src/lib/crypto/old/ChangeLog b/src/lib/crypto/old/ChangeLog
index ba4eadfd6..cada47302 100644
--- a/src/lib/crypto/old/ChangeLog
+++ b/src/lib/crypto/old/ChangeLog
@@ -1,3 +1,11 @@
+2000-01-21  Ken Raeburn  <raeburn@mit.edu>
+
+	* des_stringtokey.c (mit_des_string_to_key_int): Declare.
+	* old_decrypt.c (krb5_old_decrypt): Delete unused variable.
+	Change if(a=b) constructs to silence gcc warning.
+	* old_encrypt.c (krb5_old_encrypt): Change if(a=b) constructs to
+	silence gcc warning.
+
 1999-10-26  Tom Yu  <tlyu@mit.edu>
 
 	* Makefile.in: Clean up usage of CFLAGS, CPPFLAGS, DEFS, DEFINES,
diff --git a/src/lib/crypto/old/des_stringtokey.c b/src/lib/crypto/old/des_stringtokey.c
index ed2b7339a..8aaac792e 100644
--- a/src/lib/crypto/old/des_stringtokey.c
+++ b/src/lib/crypto/old/des_stringtokey.c
@@ -27,6 +27,12 @@
 #include "k5-int.h"
 #include "old.h"
 
+/* XXX */
+extern krb5_error_code mit_des_string_to_key_int
+KRB5_PROTOTYPE ((krb5_keyblock FAR * keyblock,
+		 const krb5_data FAR * data,
+		 const krb5_data FAR * salt));
+
 krb5_error_code
 krb5_des_string_to_key(enc, string, salt, key)
      krb5_const struct krb5_enc_provider *enc;
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);
 }
-
diff --git a/src/lib/crypto/old/old_encrypt.c b/src/lib/crypto/old/old_encrypt.c
index 9470d8a06..d90d0f885 100644
--- a/src/lib/crypto/old/old_encrypt.c
+++ b/src/lib/crypto/old/old_encrypt.c
@@ -73,7 +73,7 @@ krb5_old_encrypt(enc, hash, key, usage, ivec, input, output)
     datain.length = blocksize;
     datain.data = output->data;
 
-    if (ret = krb5_c_random_make_octets(/* XXX */ 0, &datain))
+    if ((ret = krb5_c_random_make_octets(/* XXX */ 0, &datain)))
 	return(ret);
     memcpy(output->data+blocksize+hashsize, input->data, input->length);
 
@@ -82,7 +82,7 @@ krb5_old_encrypt(enc, hash, key, usage, ivec, input, output)
     datain.length = hashsize;
     datain.data = output->data+blocksize;
 
-    if (ret = ((*(hash->hash))(1, output, &datain)))
+    if ((ret = ((*(hash->hash))(1, output, &datain))))
 	goto cleanup;
 
     /* encrypt it */
@@ -94,7 +94,7 @@ krb5_old_encrypt(enc, hash, key, usage, ivec, input, output)
 	ivec = &crcivec;
     }
 
-    if (ret = ((*(enc->encrypt))(key, ivec, output, output)))
+    if ((ret = ((*(enc->encrypt))(key, ivec, output, output))))
 	goto cleanup;
 
 cleanup: