From: Nathaniel McCallum <npmccallum@redhat.com>
Date: Mon, 26 Jan 2015 18:59:54 +0000 (-0500)
Subject: Fix const correctness on krb5_c_fx_cf2_simple()
X-Git-Tag: krb5-1.14-alpha1~177
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d67122a21af8c24657fb7dfbb572afad4933b538;p=thirdparty%2Fkrb5.git

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 6f7cff4217..af2e1fb283 100644
--- 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 a0654b6b41..49584efda2 100644
--- 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;