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
This commit is contained in:
Love Hörnquist Åstrand
2005-11-24 09:57:50 +00:00
parent 2f31564fc4
commit 52e365482b

View File

@@ -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);