diff options
| author | Tom Yu <tlyu@mit.edu> | 2001-10-25 20:22:14 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 2001-10-25 20:22:14 +0000 |
| commit | d9ad872adbb2e7accf64964b03da2297d769d804 (patch) | |
| tree | ca6b66f39a26eebef36a360c88ee2f7febd89b9f /src/lib | |
| parent | ef9b79c0dd6bdc5d7b198dc1d681086d84b86b22 (diff) | |
* svr_principal.c (kadm5_decrypt_key): For now, coerce enctype of
output keyblock in case we got a match on a similar enctype.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@13856 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/kadm5/srv/ChangeLog | 5 | ||||
| -rw-r--r-- | src/lib/kadm5/srv/svr_principal.c | 7 |
2 files changed, 12 insertions, 0 deletions
diff --git a/src/lib/kadm5/srv/ChangeLog b/src/lib/kadm5/srv/ChangeLog index df297ffdf0..d9a7ee7d91 100644 --- a/src/lib/kadm5/srv/ChangeLog +++ b/src/lib/kadm5/srv/ChangeLog @@ -1,3 +1,8 @@ +2001-10-22 Tom Yu <tlyu@mit.edu> + + * svr_principal.c (kadm5_decrypt_key): For now, coerce enctype of + output keyblock in case we got a match on a similar enctype. + 2001-10-16 Mitchell Berger <mitchb@mit.edu> Matt Crawford <crawdad@fnal.gov> diff --git a/src/lib/kadm5/srv/svr_principal.c b/src/lib/kadm5/srv/svr_principal.c index 933d3c1f77..1586bc5b4c 100644 --- a/src/lib/kadm5/srv/svr_principal.c +++ b/src/lib/kadm5/srv/svr_principal.c @@ -1767,6 +1767,13 @@ kadm5_ret_t kadm5_decrypt_key(void *server_handle, keyblock, keysalt))) return ret; + /* + * Coerce the enctype of the output keyblock in case we got an + * inexact match on the enctype; this behavior will go away when + * the key storage architecture gets redesigned for 1.3. + */ + keyblock->enctype = ktype; + if (kvnop) *kvnop = key_data->key_data_kvno; |