Fix const correctness on krb5_c_fx_cf2_simple()

libk5crypto functions generally use "const krb5_keyblock *" for input
keyblocks.  Do this in krb5_c_fx_cf2_simple() for caller convenience.

[ghudson@mit.edu: expanded commit message]

ticket: 8062 (new)

diff --git a/src/include/krb5/krb5.hin b/src/include/krb5/krb5.hin
index 6f7cff42172304f73920edb3adaed9a4d7c21a17..af2e1fb283bd081e496ddd6cd09ae0fd63c2ea13 100644 (file)
--- a/src/include/krb5/krb5.hin
+++ b/src/include/krb5/krb5.hin
@@ -662,8 +662,8 @@ krb5_c_prf_length(krb5_context context, krb5_enctype enctype, size_t *len);
  */
 krb5_error_code KRB5_CALLCONV
 krb5_c_fx_cf2_simple(krb5_context context,
-                     krb5_keyblock *k1, const char *pepper1,
-                     krb5_keyblock *k2, const char *pepper2,
+                     const krb5_keyblock *k1, const char *pepper1,
+                     const krb5_keyblock *k2, const char *pepper2,
                      krb5_keyblock **out);
 
 /**

diff --git a/src/lib/crypto/krb/cf2.c b/src/lib/crypto/krb/cf2.c
index a0654b6b41b56206e0cd5e1a609acf4fa93452e7..49584efda291a7fafc909312719e1897a4f70ce4 100644 (file)
--- a/src/lib/crypto/krb/cf2.c
+++ b/src/lib/crypto/krb/cf2.c
@@ -36,7 +36,7 @@
  * a count byte  to get enough bits of output.
  */
 static krb5_error_code
-prf_plus(krb5_context context, krb5_keyblock *k, const char *pepper,
+prf_plus(krb5_context context, const krb5_keyblock *k, const char *pepper,
          size_t keybytes, char **out)
 {
     krb5_error_code retval = 0;
@@ -88,8 +88,8 @@ cleanup:
 
 krb5_error_code KRB5_CALLCONV
 krb5_c_fx_cf2_simple(krb5_context context,
-                     krb5_keyblock *k1, const char *pepper1,
-                     krb5_keyblock *k2, const char *pepper2,
+                     const krb5_keyblock *k1, const char *pepper1,
+                     const krb5_keyblock *k2, const char *pepper2,
                      krb5_keyblock **out)
 {
     const struct krb5_keytypes *out_enctype;