* stringtokey.c (kerberos): Now const.

(krb5_dk_string_to_key): Cast it to non-const.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@12939 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/crypto/dk/ChangeLog b/src/lib/crypto/dk/ChangeLog
index 1929ff6a1adb4f8d5125fabc641bbf735a2c88b8..ac67ff9e5788037a0fa1d0e73bc8bcc068dff35b 100644 (file)
--- a/src/lib/crypto/dk/ChangeLog
+++ b/src/lib/crypto/dk/ChangeLog
@@ -1,3 +1,8 @@
+2001-01-23  Ken Raeburn  <raeburn@mit.edu>
+
+       * stringtokey.c (kerberos): Now const.
+       (krb5_dk_string_to_key): Cast it to non-const.
+
 2000-06-03  Tom Yu  <tlyu@mit.edu>
 
        * dk_encrypt.c (krb5_dk_encrypt, krb5_marc_dk_encrypt): Chain

diff --git a/src/lib/crypto/dk/stringtokey.c b/src/lib/crypto/dk/stringtokey.c
index 8eddccdcfa789d49056d622f27b39cb3c2010a3c..549a2e178203d61a267cffa2b496cf4f703f18a0 100644 (file)
--- a/src/lib/crypto/dk/stringtokey.c
+++ b/src/lib/crypto/dk/stringtokey.c
@@ -26,7 +26,7 @@
 
 #include "dk.h"
 
-static unsigned char kerberos[] = "kerberos";
+static const unsigned char kerberos[] = "kerberos";
 #define kerberos_len (sizeof(kerberos)-1)
 
 krb5_error_code
@@ -78,7 +78,7 @@ krb5_dk_string_to_key(enc, string, salt, key)
     /* now derive the key from this one */
 
     indata.length = kerberos_len;
-    indata.data = kerberos;
+    indata.data = (unsigned char *) kerberos;
 
     if ((ret = krb5_derive_key(enc, &foldkey, key, &indata)))
        memset(key->contents, 0, key->length);