From e6bce967d024f19d4055082edf1e35537a03bd47 Mon Sep 17 00:00:00 2001
From: Johan Danielsson <joda@pdc.kth.se>
Date: Sat, 8 Jul 2000 14:52:59 +0000
Subject: [PATCH] x

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@8603 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 ChangeLog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 888626dd1..64142b5a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2000-07-08  Johan Danielsson  <joda@pdc.kth.se>
 
+	* lib/hdb/mkey.c (read_master_encryptionkey): handle old keytype
+	based files, and convert the key to cfb64
+
+	* lib/hdb/mkey.c (hdb_read_master_key): set mkey to NULL before
+	doing anything else
+
 	* lib/krb5/send_to_kdc.c: use krb5_eai_to_heim_errno
 
 	* lib/krb5/get_for_creds.c: use krb5_eai_to_heim_errno