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

(kadm5_s_randkey_principal): use _kadm5_set_keys_randomly

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@7168 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1999-10-17 15:12:41 +00:00
parent adea1b4679
commit e75add1c38
1 changed files with 22 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
lib/kadm5/randkey_s.c
View File

@@ -40,6 +40,11 @@
RCSID("$Id$"); RCSID("$Id$");
/*
* Set the keys of `princ' to random values, returning the random keys
* in `new_keys', `n_keys'.
*/
kadm5_ret_t kadm5_ret_t
kadm5_s_randkey_principal(void *server_handle, kadm5_s_randkey_principal(void *server_handle,
krb5_principal princ, krb5_principal princ,
@@ -49,7 +54,6 @@ kadm5_s_randkey_principal(void *server_handle,
kadm5_server_context *context = server_handle; kadm5_server_context *context = server_handle;
hdb_entry ent; hdb_entry ent;
kadm5_ret_t ret; kadm5_ret_t ret;
krb5_keyblock *keys = NULL;
ent.principal = princ; ent.principal = princ;
ret = context->db->open(context->context, context->db, O_RDWR, 0); ret = context->db->open(context->context, context->db, O_RDWR, 0);
@@ -58,46 +62,17 @@ kadm5_s_randkey_principal(void *server_handle,
ret = context->db->fetch(context->context, context->db, 0, &ent); ret = context->db->fetch(context->context, context->db, 0, &ent);
if(ret == HDB_ERR_NOENTRY) if(ret == HDB_ERR_NOENTRY)
goto out; goto out;
{
/* XXX this should be merged with set_keys */
int i;
keys = malloc(ent.keys.len * sizeof(*keys)); ret = _kadm5_set_keys_randomly (context,
if (keys == NULL) { &ent,
ret = ENOMEM; new_keys,
goto out2; n_keys);
} if (ret)
for(i = 0; i < ent.keys.len; i++){
Key *key = &ent.keys.val[i];
free(key->mkvno);
key->mkvno = NULL;
if(key->salt) {
/* zap any salt */
free_Salt(key->salt);
key->salt = NULL;
}
krb5_free_keyblock_contents(context->context, &key->key);
ret = krb5_generate_random_keyblock(context->context,
key->key.keytype,
&key->key);
if(ret)
break;
ret = krb5_copy_keyblock_contents(context->context,
&key->key, &keys[i]);
if(ret)
break;
*n_keys = i + 1;
}
ent.kvno++;
}
if(ret)
goto out2; goto out2;
ret = _kadm5_set_modifier(context, &ent); ret = _kadm5_set_modifier(context, &ent);
if(ret) if(ret)
goto out2; goto out3;
hdb_seal_keys(context->db, &ent); hdb_seal_keys(context->db, &ent);
@@ -108,19 +83,19 @@ kadm5_s_randkey_principal(void *server_handle,
ret = context->db->store(context->context, context->db, ret = context->db->store(context->context, context->db,
HDB_F_REPLACE, &ent); HDB_F_REPLACE, &ent);
out3:
if (ret) {
int i;
for (i = 0; i < *n_keys; ++i)
krb5_free_keyblock_contents (context->context, &(*new_keys)[i]);
free (*new_keys);
*new_keys = NULL;
*n_keys = 0;
}
out2: out2:
hdb_free_entry(context->context, &ent); hdb_free_entry(context->context, &ent);
out: out:
context->db->close(context->context, context->db); context->db->close(context->context, context->db);
if(ret && keys != NULL) {
int i;
for(i = 0; i < *n_keys; i++)
krb5_free_keyblock_contents(context->context, &keys[i]);
free(keys);
*n_keys = 0;
}
if (ret == 0)
*new_keys = keys;
return _kadm5_error_code(ret); return _kadm5_error_code(ret);
} }