diff options
| author | John Kohl <jtkohl@mit.edu> | 1990-12-14 23:52:07 +0000 |
|---|---|---|
| committer | John Kohl <jtkohl@mit.edu> | 1990-12-14 23:52:07 +0000 |
| commit | 1bc0aafd4ba3baa32e69ee9ad0d6271e14cb5ba7 (patch) | |
| tree | 15473d71c5ca29d2432fef1dbb959ad0b3e7a330 /src/lib/kdb | |
| parent | e1772c824f6bd353311dab839c7f985a86004cb4 (diff) | |
| download | krb5-1bc0aafd4ba3baa32e69ee9ad0d6271e14cb5ba7.tar.gz krb5-1bc0aafd4ba3baa32e69ee9ad0d6271e14cb5ba7.tar.xz krb5-1bc0aafd4ba3baa32e69ee9ad0d6271e14cb5ba7.zip | |
RFC draft protocol changes and related cleanups
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@1554 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/kdb')
| -rw-r--r-- | src/lib/kdb/fetch_mkey.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/lib/kdb/fetch_mkey.c b/src/lib/kdb/fetch_mkey.c index fa14564f1b..ec0bb27082 100644 --- a/src/lib/kdb/fetch_mkey.c +++ b/src/lib/kdb/fetch_mkey.c @@ -67,6 +67,8 @@ OLDDECLARG(krb5_keyblock *,key) if (fromkeyboard) { + krb5_data scratch; + if (retval = krb5_read_password(krb5_mkey_pwd_prompt1, twice ? krb5_mkey_pwd_prompt2 : 0, password, @@ -75,7 +77,10 @@ OLDDECLARG(krb5_keyblock *,key) pwd.data = password; pwd.length = size; - retval = krb5_string_to_key(eblock, key->keytype, key, &pwd, mname); + if (retval = krb5_principal2salt(mname, &scratch)) + return retval; + retval = krb5_string_to_key(eblock, key->keytype, key, &pwd, &scratch); + xfree(scratch.data); memset(password, 0, sizeof(password)); /* erase it */ return retval; |