summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEzra Peisach <epeisach@mit.edu>1995-09-09 19:05:42 +0000
committerEzra Peisach <epeisach@mit.edu>1995-09-09 19:05:42 +0000
commit1e4f642b2e1991db894e515f4617ffde4002a2ec (patch)
tree36fb65722b642b60a5f55519d46406f35fab88f7 /src
parent9164cfe8f50c46a64b398cf3aa533047a6ecf189 (diff)
downloadkrb5-1e4f642b2e1991db894e515f4617ffde4002a2ec.tar.gz
krb5-1e4f642b2e1991db894e515f4617ffde4002a2ec.tar.xz
krb5-1e4f642b2e1991db894e515f4617ffde4002a2ec.zip
Set the encryption type before decrypting
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6745 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
-rw-r--r--src/lib/kdb/ChangeLog5
-rw-r--r--src/lib/kdb/decrypt_key.c2
2 files changed, 7 insertions, 0 deletions
diff --git a/src/lib/kdb/ChangeLog b/src/lib/kdb/ChangeLog
index 18218a396..dfe27fd23 100644
--- a/src/lib/kdb/ChangeLog
+++ b/src/lib/kdb/ChangeLog
@@ -1,3 +1,8 @@
+Sat Sep 9 14:53:39 1995 Ezra Peisach <epeisach@kangaroo.mit.edu>
+
+ * decrypt_key.c (krb5_dbekd_decrypt_key_data): Set the encryption
+ type before decrypting.
+
Fri Sep 8 19:52:34 1995 Ezra Peisach (epeisach@dcl)
* decrypt_key.c: Upon error, after freeing contents field, set to
diff --git a/src/lib/kdb/decrypt_key.c b/src/lib/kdb/decrypt_key.c
index f6847eb83..e7128c9dc 100644
--- a/src/lib/kdb/decrypt_key.c
+++ b/src/lib/kdb/decrypt_key.c
@@ -47,6 +47,8 @@ krb5_dbekd_decrypt_key_data(context, eblock, key_data, keyblock, keysalt)
keyblock->magic = KV5M_KEYBLOCK;
keyblock->enctype = key_data->key_data_type[0];
+ krb5_use_enctype(context, eblock, keyblock->enctype);
+
/* Decrypt key_data_contents */
if ((keyblock->contents = (krb5_octet *)malloc(krb5_encrypt_size(
key_data->key_data_length[0] - 2, eblock->crypto_entry))) == NULL)