reformat, avoid free-ing un-init'd memory

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@16780 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2006-02-28 14:51:39 +00:00
parent 6e877e22b1
commit cbd4c81a98

View File

@@ -200,7 +200,6 @@ string_to_key_test(krb5_context context)
{ {
krb5_data password, opaque; krb5_data password, opaque;
krb5_error_code ret; krb5_error_code ret;
krb5_keyblock key;
krb5_salt salt; krb5_salt salt;
int i, val = 0; int i, val = 0;
char iter[4]; char iter[4];
@@ -242,15 +241,20 @@ string_to_key_test(krb5_context context)
printf("PBKDF2:\n"); printf("PBKDF2:\n");
hex_dump_data(keyout, keys[i].keylen); hex_dump_data(keyout, keys[i].keylen);
} }
krb5_free_keyblock_contents(context, &key);
} }
ret = krb5_string_to_key_data_salt_opaque (context, keys[i].enctype, {
password, salt, opaque, krb5_keyblock key;
ret = krb5_string_to_key_data_salt_opaque (context,
keys[i].enctype,
password,
salt,
opaque,
&key); &key);
if (ret) { if (ret) {
krb5_warn(context, ret, "%d: string_to_key_data_salt_opaque", i); krb5_warn(context, ret, "%d: string_to_key_data_salt_opaque",
i);
val = 1; val = 1;
continue; continue;
} }
@@ -275,6 +279,7 @@ string_to_key_test(krb5_context context)
} }
krb5_free_keyblock_contents(context, &key); krb5_free_keyblock_contents(context, &key);
} }
}
return val; return val;
} }