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

(_kadm5_set_keys2): rewrite

Browse Source 
(_kadm5_set_keys3): add


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@8064 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
2000-03-23 23:06:31 +00:00
parent 6e30943f99
commit 5ca9dc1371
1 changed files with 69 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
lib/kadm5/set_keys.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1997, 1998, 1999 Kungliga Tekniska H<>gskolan * Copyright (c) 1997 - 2000 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden). * (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved. * All rights reserved.
* *
@@ -166,40 +166,96 @@ out:
*/ */
kadm5_ret_t kadm5_ret_t
_kadm5_set_keys2(hdb_entry *ent, _kadm5_set_keys2(kadm5_server_context *context,
hdb_entry *ent,
int16_t n_key_data, int16_t n_key_data,
krb5_key_data *key_data) krb5_key_data *key_data)
{ {
krb5_error_code ret; krb5_error_code ret;
int i; int i;
unsigned len;
Key *keys;
ent->keys.len = n_key_data; len = n_key_data;
ent->keys.val = malloc(ent->keys.len * sizeof(*ent->keys.val)); keys = malloc (len * sizeof(*keys));
if(ent->keys.val == NULL) if (keys == NULL)
return ENOMEM; return ENOMEM;
init_keys (keys, len);
for(i = 0; i < n_key_data; i++) { for(i = 0; i < n_key_data; i++) {
ent->keys.val[i].mkvno = NULL; keys[i].mkvno = NULL;
ent->keys.val[i].key.keytype = key_data[i].key_data_type[0]; keys[i].key.keytype = key_data[i].key_data_type[0];
ret = krb5_data_copy(&ent->keys.val[i].key.keyvalue, ret = krb5_data_copy(&keys[i].key.keyvalue,
key_data[i].key_data_contents[0], key_data[i].key_data_contents[0],
key_data[i].key_data_length[0]); key_data[i].key_data_length[0]);
if(ret) if(ret)
return ret; goto out;
if(key_data[i].key_data_ver == 2) { if(key_data[i].key_data_ver == 2) {
Salt *salt; Salt *salt;
salt = malloc(sizeof(*salt)); salt = malloc(sizeof(*salt));
if(salt == NULL) if(salt == NULL) {
return ENOMEM; ret = ENOMEM;
ent->keys.val[i].salt = salt; goto out;
}
keys[i].salt = salt;
salt->type = key_data[i].key_data_type[1]; salt->type = key_data[i].key_data_type[1];
krb5_data_copy(&salt->salt, krb5_data_copy(&salt->salt,
key_data[i].key_data_contents[1], key_data[i].key_data_contents[1],
key_data[i].key_data_length[1]); key_data[i].key_data_length[1]);
} else } else
ent->keys.val[i].salt = NULL; keys[i].salt = NULL;
} }
free_keys (context, ent->keys.len, ent->keys.val);
ent->keys.len = len;
ent->keys.val = keys;
ent->kvno++; ent->kvno++;
return 0; return 0;
out:
free_keys (context, len, keys);
return ret;
}
/*
* Set the keys of `ent' to `n_keys, keys'
*/
kadm5_ret_t
_kadm5_set_keys3(kadm5_server_context *context,
hdb_entry *ent,
int n_keys,
krb5_keyblock *keyblocks)
{
krb5_error_code ret;
int i;
unsigned len;
Key *keys;
len = n_keys;
keys = malloc (len * sizeof(*keys));
if (keys == NULL)
return ENOMEM;
init_keys (keys, len);
for(i = 0; i < n_keys; i++) {
keys[i].mkvno = NULL;
ret = krb5_copy_keyblock_contents (context->context,
&keyblocks[i],
&keys[i].key);
if(ret)
goto out;
keys[i].salt = NULL;
}
free_keys (context, ent->keys.len, ent->keys.val);
ent->keys.len = len;
ent->keys.val = keys;
ent->kvno++;
return 0;
out:
free_keys (context, len, keys);
return ret;
} }
/* /*