Set the keyblock magic number and encryption type

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@4670 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/admin/convert/ChangeLog b/src/admin/convert/ChangeLog
index eaa101001ed0302945493bc012014a73e105c541..e89f280a765ee8aadca99816154350c25ca08cbe 100644 (file)
--- a/src/admin/convert/ChangeLog
+++ b/src/admin/convert/ChangeLog
@@ -3,6 +3,11 @@ Tue Nov 15 23:55:56 1994  Mark Eichin  (eichin@cygnus.com)
        * kdb5_convert.c (enter_in_v5_db): use the correct instance for
        the mod_name field.
 
+Thu Nov 10 17:07:54 1994  Theodore Y. Ts'o  (tytso@dcl)
+
+       * kdb5_convert.c (enter_in_v5_db): Set the keyblock magic number
+               and encryption type.
+
 Mon Oct  3 19:12:02 1994  Theodore Y. Ts'o  (tytso@dcl)
 
        * Makefile.in: Use $(srcdir) to find manual page for make install.

diff --git a/src/admin/convert/kdb5_convert.c b/src/admin/convert/kdb5_convert.c
index c5caeba0f8721bd9a8310f0694aadf04395d44cb..26fa59f0a21c85acb7268ff40fdd39a0c119636e 100644 (file)
--- a/src/admin/convert/kdb5_convert.c
+++ b/src/admin/convert/kdb5_convert.c
@@ -528,6 +528,8 @@ Principal *princ;
     memcpy((char *) (((long *) v4key) + 1), (char *)&(princ->key_high), 4);
     kdb_encrypt_key (v4key, v4key, master_key, master_key_schedule, DECRYPT);
 
+    v4v5key.magic = KV5M_KEYBLOCK;
+    v4v5key.etype = master_keyblock.etype;
     v4v5key.contents = (krb5_octet *)v4key;
     v4v5key.keytype = KEYTYPE_DES;
     v4v5key.length = sizeof(v4key);