pullup from trunk

ticket: 2964
version_fixed: 1.4.1

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-4@17139 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/crypto/ChangeLog b/src/lib/crypto/ChangeLog
index feccaa79125db713373c0318d5edaf4d2f6eb167..fa03524a3aff5da880fa1a4ea0247888539a54ba 100644 (file)
--- a/src/lib/crypto/ChangeLog
+++ b/src/lib/crypto/ChangeLog
@@ -1,3 +1,12 @@
+2005-03-15  Jeffrey Altman <jaltman@mit.edu>
+
+        * keyed_cksum.c: (krb5_c_is_keyed_cksum): this is a boolean 
+          function.  It should not return -1U on error.  Instead return
+          0 (false) so that the caller doesn't think it succeeded.
+
+          The only two callers are rd_safe and mk_safe.  Neither checks
+          for special cases.
+
 2005-01-13  Ken Raeburn  <raeburn@mit.edu>
 
        * prng.c (krb5int_prng_init): Incorporate do_yarrow_init body.

diff --git a/src/lib/crypto/keyed_cksum.c b/src/lib/crypto/keyed_cksum.c
index 7056f8f99eae0524782739f1d7ebfd8fef281a69..4d50c2c4aefb180429788dec5fd917f44c667c64 100644 (file)
--- a/src/lib/crypto/keyed_cksum.c
+++ b/src/lib/crypto/keyed_cksum.c
@@ -45,7 +45,7 @@ krb5_c_is_keyed_cksum(krb5_cksumtype ctype)
 
     /* ick, but it's better than coredumping, which is what the
        old code would have done */
-    return -1U;
+    return 0;   /* error case */
 }
 
 krb5_boolean KRB5_CALLCONV