From 1752eb97e0507faae7419cd73bb48587972c764a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= Date: Tue, 2 Sep 2003 23:20:46 +0000 Subject: [PATCH] move variable thats used within a #ifdef to be defined within that #ifdef git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@12730 ec53bebd-3082-4978-b11e-865c3cabbd6b --- lib/krb5/aes-test.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/krb5/aes-test.c b/lib/krb5/aes-test.c index f7cb6bb5e..90cf9ecf3 100644 --- a/lib/krb5/aes-test.c +++ b/lib/krb5/aes-test.c @@ -212,7 +212,6 @@ string_to_key_test(krb5_context context) krb5_salt salt; int i, val = 0; char iter[4]; - char keyout[32]; for (i = 0; i < sizeof(keys)/sizeof(keys[0]); i++) { @@ -236,13 +235,14 @@ string_to_key_test(krb5_context context) i, keys[i].password, keys[i].salt); #endif - if (keys[i].keylen > sizeof(keyout)) - abort(); - #ifdef ENABLE_AES if (keys[i].pbkdf2) { - #ifdef HAVE_OPENSSL + char keyout[32]; + + if (keys[i].keylen > sizeof(keyout)) + abort(); + PKCS5_PBKDF2_HMAC_SHA1(password.data, password.length, salt.saltvalue.data, salt.saltvalue.length, keys[i].iterations,