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

5 files changed, 34 insertions, 25 deletions

diff --git a/src/lib/crypto/dk/ChangeLog b/src/lib/crypto/dk/ChangeLog
index d57857e82..90e34f87c 100644
--- a/src/lib/crypto/dk/ChangeLog
+++ b/src/lib/crypto/dk/ChangeLog
@@ -1,3 +1,12 @@
+2000-01-21  Ken Raeburn  <raeburn@mit.edu>
+
+	* checksum.c (krb5_dk_make_checksum): enc_providers are now
+	const.  Modify if(a=b) assignment/test constructs to silence gcc
+	warnings.
+	* dk_decrypt.c (krb5_dk_decrypt, krb5_marc_dk_decrypt): Ditto.
+	* dk_encrypt.c (krb5_dk_encrypt, krb5_marc_dk_encrypt): Ditto.
+	* stringtokey.c (krb5_dk_string_to_key): Ditto.  Include dk.h.
+
 1999-10-26  Tom Yu  <tlyu@mit.edu>
 
 	* Makefile.in: Clean up usage of CFLAGS, CPPFLAGS, DEFS, DEFINES,
diff --git a/src/lib/crypto/dk/checksum.c b/src/lib/crypto/dk/checksum.c
index b9318d239..535ea7c04 100644
--- a/src/lib/crypto/dk/checksum.c
+++ b/src/lib/crypto/dk/checksum.c
@@ -39,7 +39,7 @@ krb5_dk_make_checksum(hash, key, usage, input, output)
      krb5_data *output;
 {
     int i;
-    struct krb5_enc_provider *enc;
+    const struct krb5_enc_provider *enc;
     size_t blocksize, keybytes, keylength;
     krb5_error_code ret;
     unsigned char constantdata[K5CLENGTH];
@@ -83,14 +83,14 @@ krb5_dk_make_checksum(hash, key, usage, input, output)
 
     datain.data[4] = 0x99;
 
-    if (ret = krb5_derive_key(enc, key, &kc, &datain))
+    if ((ret = krb5_derive_key(enc, key, &kc, &datain)) != 0)
 	goto cleanup;
 
     /* hash the data */
 
     datain = *input;
 
-    if (ret = krb5_hmac(hash, &kc, 1, &datain, output))
+    if ((ret = krb5_hmac(hash, &kc, 1, &datain, output)) != 0)
 	memset(output->data, 0, output->length);
 
     /* ret is set correctly by the prior call */
@@ -157,7 +157,7 @@ krb5_marc_dk_make_checksum(hash, key, usage, input, output)
 
     datain[0].data[4] = 0x99;
 
-    if (ret = krb5_derive_key(enc, key, &kc, &datain[0]))
+    if ((ret = krb5_derive_key(enc, key, &kc, &datain[0])) != 0)
 	goto cleanup;
 
     /* hash the data */
@@ -170,7 +170,7 @@ krb5_marc_dk_make_checksum(hash, key, usage, input, output)
 
     datain[1] = *input;
 
-    if (ret = krb5_hmac(hash, &kc, 2, datain, output))
+    if ((ret = krb5_hmac(hash, &kc, 2, datain, output)) != 0)
 	memset(output->data, 0, output->length);
 
     /* ret is set correctly by the prior call */
diff --git a/src/lib/crypto/dk/dk_decrypt.c b/src/lib/crypto/dk/dk_decrypt.c
index 71fdb80d0..d3077615f 100644
--- a/src/lib/crypto/dk/dk_decrypt.c
+++ b/src/lib/crypto/dk/dk_decrypt.c
@@ -89,12 +89,12 @@ krb5_dk_decrypt(enc, hash, key, usage, ivec, input, output)
 
     d1.data[4] = 0xAA;
 
-    if (ret = krb5_derive_key(enc, key, &ke, &d1))
+    if ((ret = krb5_derive_key(enc, key, &ke, &d1)) != 0)
 	goto cleanup;
 
     d1.data[4] = 0x55;
 
-    if (ret = krb5_derive_key(enc, key, &ki, &d1))
+    if ((ret = krb5_derive_key(enc, key, &ki, &d1)) != 0)
 	goto cleanup;
 
     /* decrypt the ciphertext */
@@ -105,7 +105,7 @@ krb5_dk_decrypt(enc, hash, key, usage, ivec, input, output)
     d2.length = enclen;
     d2.data = plaindata;
 
-    if (ret = ((*(enc->decrypt))(&ke, ivec, &d1, &d2)))
+    if ((ret = ((*(enc->decrypt))(&ke, ivec, &d1, &d2))) != 0)
 	goto cleanup;
 
     /* verify the hash */
@@ -113,7 +113,7 @@ krb5_dk_decrypt(enc, hash, key, usage, ivec, input, output)
     d1.length = hashsize;
     d1.data = cksum;
 
-    if (ret = krb5_hmac(hash, &ki, 1, &d2, &d1))
+    if ((ret = krb5_hmac(hash, &ki, 1, &d2, &d1)) != 0)
 	goto cleanup;
 
     if (memcmp(cksum, input->data+enclen, hashsize) != 0) {
@@ -211,12 +211,12 @@ krb5_marc_dk_decrypt(enc, hash, key, usage, ivec, input, output)
 
     d1.data[4] = 0xAA;
 
-    if (ret = krb5_derive_key(enc, key, &ke, &d1))
+    if ((ret = krb5_derive_key(enc, key, &ke, &d1)) != 0)
 	goto cleanup;
 
     d1.data[4] = 0x55;
 
-    if (ret = krb5_derive_key(enc, key, &ki, &d1))
+    if ((ret = krb5_derive_key(enc, key, &ki, &d1)) != 0)
 	goto cleanup;
 
     /* decrypt the ciphertext */
@@ -227,7 +227,7 @@ krb5_marc_dk_decrypt(enc, hash, key, usage, ivec, input, output)
     d2.length = enclen;
     d2.data = plaindata;
 
-    if (ret = ((*(enc->decrypt))(&ke, ivec, &d1, &d2)))
+    if ((ret = ((*(enc->decrypt))(&ke, ivec, &d1, &d2))) != 0)
 	goto cleanup;
 
     /* verify the hash */
@@ -235,7 +235,7 @@ krb5_marc_dk_decrypt(enc, hash, key, usage, ivec, input, output)
     d1.length = hashsize;
     d1.data = cksum;
 
-    if (ret = krb5_hmac(hash, &ki, 1, &d2, &d1))
+    if ((ret = krb5_hmac(hash, &ki, 1, &d2, &d1)) != 0)
 	goto cleanup;
 
     if (memcmp(cksum, input->data+enclen, hashsize) != 0) {
diff --git a/src/lib/crypto/dk/dk_encrypt.c b/src/lib/crypto/dk/dk_encrypt.c
index 30212c443..8627353db 100644
--- a/src/lib/crypto/dk/dk_encrypt.c
+++ b/src/lib/crypto/dk/dk_encrypt.c
@@ -110,12 +110,12 @@ krb5_dk_encrypt(enc, hash, key, usage, ivec, input, output)
 
     d1.data[4] = 0xAA;
 
-    if (ret = krb5_derive_key(enc, key, &ke, &d1))
+    if ((ret = krb5_derive_key(enc, key, &ke, &d1)))
 	goto cleanup;
 
     d1.data[4] = 0x55;
 
-    if (ret = krb5_derive_key(enc, key, &ki, &d1))
+    if ((ret = krb5_derive_key(enc, key, &ki, &d1)))
 	goto cleanup;
 
     /* put together the plaintext */
@@ -123,7 +123,7 @@ krb5_dk_encrypt(enc, hash, key, usage, ivec, input, output)
     d1.length = blocksize;
     d1.data = plaintext;
 
-    if (ret = krb5_c_random_make_octets(/* XXX */ 0, &d1))
+    if ((ret = krb5_c_random_make_octets(/* XXX */ 0, &d1)))
 	goto cleanup;
 
     memcpy(plaintext+blocksize, input->data, input->length);
@@ -139,7 +139,7 @@ krb5_dk_encrypt(enc, hash, key, usage, ivec, input, output)
     d2.length = plainlen;
     d2.data = output->data;
 
-    if (ret = ((*(enc->encrypt))(&ke, ivec, &d1, &d2)))
+    if ((ret = ((*(enc->encrypt))(&ke, ivec, &d1, &d2))))
 	goto cleanup;
 
     /* hash the plaintext */
@@ -149,7 +149,7 @@ krb5_dk_encrypt(enc, hash, key, usage, ivec, input, output)
 
     output->length = enclen;
 
-    if (ret = krb5_hmac(hash, &ki, 1, &d1, &d2))
+    if ((ret = krb5_hmac(hash, &ki, 1, &d1, &d2)))
 	memset(d2.data, 0, d2.length);
 
     /* ret is set correctly by the prior call */
@@ -241,12 +241,12 @@ krb5_marc_dk_encrypt(enc, hash, key, usage, ivec, input, output)
 
     d1.data[4] = 0xAA;
 
-    if (ret = krb5_derive_key(enc, key, &ke, &d1))
+    if ((ret = krb5_derive_key(enc, key, &ke, &d1)))
 	goto cleanup;
 
     d1.data[4] = 0x55;
 
-    if (ret = krb5_derive_key(enc, key, &ki, &d1))
+    if ((ret = krb5_derive_key(enc, key, &ki, &d1)))
 	goto cleanup;
 
     /* put together the plaintext */
@@ -254,7 +254,7 @@ krb5_marc_dk_encrypt(enc, hash, key, usage, ivec, input, output)
     d1.length = blocksize;
     d1.data = plaintext;
 
-    if (ret = krb5_c_random_make_octets(/* XXX */ 0, &d1))
+    if ((ret = krb5_c_random_make_octets(/* XXX */ 0, &d1)))
 	goto cleanup;
 
     (plaintext+blocksize)[0] = (input->length>>24)&0xff;
@@ -275,7 +275,7 @@ krb5_marc_dk_encrypt(enc, hash, key, usage, ivec, input, output)
     d2.length = plainlen;
     d2.data = output->data;
 
-    if (ret = ((*(enc->encrypt))(&ke, ivec, &d1, &d2)))
+    if ((ret = ((*(enc->encrypt))(&ke, ivec, &d1, &d2))))
 	goto cleanup;
 
     /* hash the plaintext */
@@ -285,7 +285,7 @@ krb5_marc_dk_encrypt(enc, hash, key, usage, ivec, input, output)
 
     output->length = enclen;
 
-    if (ret = krb5_hmac(hash, &ki, 1, &d1, &d2))
+    if ((ret = krb5_hmac(hash, &ki, 1, &d1, &d2)))
 	memset(d2.data, 0, d2.length);
 
     /* ret is set correctly by the prior call */
diff --git a/src/lib/crypto/dk/stringtokey.c b/src/lib/crypto/dk/stringtokey.c
index c033dc35a..8eddccdcf 100644
--- a/src/lib/crypto/dk/stringtokey.c
+++ b/src/lib/crypto/dk/stringtokey.c
@@ -24,7 +24,7 @@
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#include "k5-int.h"
+#include "dk.h"
 
 static unsigned char kerberos[] = "kerberos";
 #define kerberos_len (sizeof(kerberos)-1)
@@ -80,7 +80,7 @@ krb5_dk_string_to_key(enc, string, salt, key)
     indata.length = kerberos_len;
     indata.data = kerberos;
 
-    if (ret = krb5_derive_key(enc, &foldkey, key, &indata))
+    if ((ret = krb5_derive_key(enc, &foldkey, key, &indata)))
 	memset(key->contents, 0, key->length);
 
     /* ret is set correctly by the prior call */