diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2001-01-24 04:59:07 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2001-01-24 04:59:07 +0000 |
| commit | 078120e2c3fb3a30cf4587e6ecaf821a03e631c9 (patch) | |
| tree | 2a2b81cae94e4a0f934af518bb328277a9098bf5 /src/lib/crypto/dk | |
| parent | 5ebbb9bd5886a38c24dbb2c71d95a2b09d7b66c6 (diff) | |
| download | krb5-078120e2c3fb3a30cf4587e6ecaf821a03e631c9.zip krb5-078120e2c3fb3a30cf4587e6ecaf821a03e631c9.tar.gz krb5-078120e2c3fb3a30cf4587e6ecaf821a03e631c9.tar.bz2 | |
* 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
Diffstat (limited to 'src/lib/crypto/dk')
| -rw-r--r-- | src/lib/crypto/dk/ChangeLog | 5 | ||||
| -rw-r--r-- | 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 1929ff6..ac67ff9 100644 --- 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 8eddccd..549a2e1 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); |