Reverse order of n_ks_tuple and ks_tuple in hdb_generate_key_set().
Signed-off-by: Nicolas Williams <nico@cryptonector.com>
This commit is contained in:

committed by
Nicolas Williams

parent
21173f98dc
commit
2f6ad56c46
@@ -476,7 +476,7 @@ out:
|
||||
|
||||
krb5_error_code
|
||||
hdb_generate_key_set(krb5_context context, krb5_principal principal,
|
||||
int n_ks_tuple, krb5_key_salt_tuple *ks_tuple,
|
||||
krb5_key_salt_tuple *ks_tuple, int n_ks_tuple,
|
||||
Key **ret_key_set, size_t *nkeyset, int no_salt)
|
||||
{
|
||||
char **ktypes = NULL;
|
||||
@@ -596,7 +596,7 @@ hdb_generate_key_set_password(krb5_context context,
|
||||
krb5_error_code ret;
|
||||
size_t i;
|
||||
|
||||
ret = hdb_generate_key_set(context, principal, 0, NULL,
|
||||
ret = hdb_generate_key_set(context, principal, NULL, 0,
|
||||
keys, num_keys, 0);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
@@ -85,7 +85,7 @@ parse_file(krb5_context context, krb5_principal principal, int no_salt)
|
||||
size_t nkeys;
|
||||
Key *keys;
|
||||
|
||||
ret = hdb_generate_key_set(context, principal, 0, NULL, &keys, &nkeys,
|
||||
ret = hdb_generate_key_set(context, principal, NULL, 0, &keys, &nkeys,
|
||||
no_salt);
|
||||
if (ret)
|
||||
krb5_err(context, 1, ret, "hdb_generate_key_set");
|
||||
|
@@ -336,7 +336,7 @@ _kadm5_set_keys_randomly (kadm5_server_context *context,
|
||||
Key *keys;
|
||||
|
||||
ret = hdb_generate_key_set(context->context, ent->principal,
|
||||
n_ks_tuple, ks_tuple, &keys, &num_keys, 1);
|
||||
ks_tuple, n_ks_tuple, &keys, &num_keys, 1);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
|
Reference in New Issue
Block a user