From 078120e2c3fb3a30cf4587e6ecaf821a03e631c9 Mon Sep 17 00:00:00 2001 From: Ken Raeburn Date: Wed, 24 Jan 2001 04:59:07 +0000 Subject: [PATCH] * 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 --- src/lib/crypto/dk/ChangeLog | 5 +++++ src/lib/crypto/dk/stringtokey.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/lib/crypto/dk/ChangeLog b/src/lib/crypto/dk/ChangeLog index 1929ff6a1..ac67ff9e5 100644 --- a/src/lib/crypto/dk/ChangeLog +++ b/src/lib/crypto/dk/ChangeLog @@ -1,3 +1,8 @@ +2001-01-23 Ken Raeburn + + * stringtokey.c (kerberos): Now const. + (krb5_dk_string_to_key): Cast it to non-const. + 2000-06-03 Tom Yu * 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 8eddccdcf..549a2e178 100644 --- 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); -- 2.26.2