summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTheodore Tso <tytso@mit.edu>1994-11-17 07:10:36 +0000
committerTheodore Tso <tytso@mit.edu>1994-11-17 07:10:36 +0000
commit1a23f72c755bf298b0c8ac8b0991d13ac9757e9f (patch)
tree0cc34eb00c91f807d22abbde1fea49cf70f94a50
parent767e9c7921b083871a1cde095008fb9a5f5e15b4 (diff)
downloadkrb5-1a23f72c755bf298b0c8ac8b0991d13ac9757e9f.tar.gz
krb5-1a23f72c755bf298b0c8ac8b0991d13ac9757e9f.tar.xz
krb5-1a23f72c755bf298b0c8ac8b0991d13ac9757e9f.zip
Set the keyblock's magic number and ecryption type information appropriately
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@4671 dc483132-0cff-0310-8789-dd5450dbe970
-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 be5a24aae..a5b1d7dfe 100644
--- a/src/lib/kdb/ChangeLog
+++ b/src/lib/kdb/ChangeLog
@@ -1,3 +1,8 @@
+Thu Nov 10 17:20:42 1994 Theodore Y. Ts'o (tytso@dcl)
+
+ * decrypt_key.c (krb5_kdb_decrypt_key): Set the keyblock's magic
+ number and ecryption type information appropriately.
+
Tue Nov 8 18:03:23 1994 Theodore Y. Ts'o (tytso@dcl)
* fetch_mkey.c (krb5_db_fetch_mkey): Set the keyblock's magic
diff --git a/src/lib/kdb/decrypt_key.c b/src/lib/kdb/decrypt_key.c
index 20a2c20f8..a131bd66e 100644
--- a/src/lib/kdb/decrypt_key.c
+++ b/src/lib/kdb/decrypt_key.c
@@ -46,6 +46,8 @@ krb5_keyblock *out;
/* the encrypted version is stored as the unencrypted key length
(4 bytes, MSB first) followed by the encrypted key. */
+ out->magic = KV5M_KEYBLOCK;
+ out->etype = ETYPE_UNKNOWN;
out->keytype = in->keytype;
out->length = krb5_encrypt_size(in->length-sizeof(in->length),
eblock->crypto_entry);