oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Reverse order of n_ks_tuple and ks_tuple in hdb_generate_key_set().

Browse Source 
Signed-off-by: Nicolas Williams <nico@cryptonector.com>
This commit is contained in:
Roland C. Dowdeswell
2011-11-25 14:08:26 +00:00
committed by Nicolas Williams
parent 21173f98dc
commit 2f6ad56c46
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/hdb/keys.c
View File

@@ -476,7 +476,7 @@ out:
krb5_error_code krb5_error_code
hdb_generate_key_set(krb5_context context, krb5_principal principal, 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) Key **ret_key_set, size_t *nkeyset, int no_salt)
{ {
char **ktypes = NULL; char **ktypes = NULL;
@@ -596,7 +596,7 @@ hdb_generate_key_set_password(krb5_context context,
krb5_error_code ret; krb5_error_code ret;
size_t i; 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); keys, num_keys, 0);
if (ret) if (ret)
return ret; return ret;

2
lib/kadm5/default_keys.c
View File

@@ -85,7 +85,7 @@ parse_file(krb5_context context, krb5_principal principal, int no_salt)
size_t nkeys; size_t nkeys;
Key *keys; 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); no_salt);
if (ret) if (ret)
krb5_err(context, 1, ret, "hdb_generate_key_set"); krb5_err(context, 1, ret, "hdb_generate_key_set");

2
lib/kadm5/set_keys.c
View File

@@ -336,7 +336,7 @@ _kadm5_set_keys_randomly (kadm5_server_context *context,
Key *keys; Key *keys;
ret = hdb_generate_key_set(context->context, ent->principal, 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) if (ret)
return ret; return ret;