From 859d1f09960a87e043deaf25e29ed204b8054cfd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= <lha@kth.se>
Date: Thu, 24 Nov 2005 09:58:04 +0000
Subject: [PATCH] x

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

diff --git a/ChangeLog b/ChangeLog
index a56e39a4d..aacbce15e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
-2005-11-07  Love Hörnquist Åstrand  <lha@it.su.se>
+2005-11-24  Love Hörnquist Åstrand  <lha@it.su.se>
 
+	* lib/krb5/test_crypto.c: Split encryption and s2k iterations to
+	diffrent counters, 38seconds of aes256 s2k is way too long.
+
+	* lib/krb5/test_crypto.c: Add timing code for s2k function.
+
+2005-11-07  Love Hörnquist Åstrand  <lha@it.su.se>
+	
 	* kdc/kerberos5.c: Print the time the principal expired, based on
 	patch from Andrew Bartlett.