From 52e365482bda8d559a16dae5d7ad12fe49ac888c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= Date: Thu, 24 Nov 2005 09:57:50 +0000 Subject: [PATCH] Split encryption and s2k iterations to diffrent counters, 38seconds of aes256 s2k is way too long. git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@16290 ec53bebd-3082-4978-b11e-865c3cabbd6b --- lib/krb5/test_crypto.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/lib/krb5/test_crypto.c b/lib/krb5/test_crypto.c index 18a913c35..b3cfee72a 100644 --- a/lib/krb5/test_crypto.c +++ b/lib/krb5/test_crypto.c @@ -155,7 +155,7 @@ main(int argc, char **argv) { krb5_context context; krb5_error_code ret; - int i, iterations; + int i, enciter, s2kiter; int optidx = 0; krb5_salt salt; @@ -191,21 +191,22 @@ main(int argc, char **argv) if (ret) errx (1, "krb5_init_context failed: %d", ret); - iterations = 1000; + enciter = 1000; + s2kiter = 100; for (i = 0; i < sizeof(enctypes)/sizeof(enctypes[0]); i++) { - time_encryption(context, 16, enctypes[i], iterations); - time_encryption(context, 32, enctypes[i], iterations); - time_encryption(context, 512, enctypes[i], iterations); - time_encryption(context, 1024, enctypes[i], iterations); - time_encryption(context, 2048, enctypes[i], iterations); - time_encryption(context, 4096, enctypes[i], iterations); - time_encryption(context, 8192, enctypes[i], iterations); - time_encryption(context, 16384, enctypes[i], iterations); - time_encryption(context, 32768, enctypes[i], iterations); + time_encryption(context, 16, enctypes[i], enciter); + time_encryption(context, 32, enctypes[i], enciter); + time_encryption(context, 512, enctypes[i], enciter); + time_encryption(context, 1024, enctypes[i], enciter); + time_encryption(context, 2048, enctypes[i], enciter); + time_encryption(context, 4096, enctypes[i], enciter); + time_encryption(context, 8192, enctypes[i], enciter); + time_encryption(context, 16384, enctypes[i], enciter); + time_encryption(context, 32768, enctypes[i], enciter); - time_s2k(context, enctypes[i], "mYsecreitPassword", salt, iterations); + time_s2k(context, enctypes[i], "mYsecreitPassword", salt, s2kiter); } krb5_free_context(context);