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

(_kadm5_set_keys_randomly): add ETYPE_AES256_CTS_HMAC_SHA1_96 key when

Browse Source 
configuried with aes support


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@12185 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2003-04-30 17:17:12 +00:00
parent 98918dc79d
commit 2d2d16d817
1 changed files with 31 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
lib/kadm5/set_keys.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1997 - 2001 Kungliga Tekniska H<>gskolan * Copyright (c) 1997 - 2001, 2003 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden). * (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved. * All rights reserved.
* *
@@ -409,6 +409,23 @@ _kadm5_set_keys3(kadm5_server_context *context,
return ret; return ret;
} }
/*
*
*/
static krb5_error_code
gen_random_key(krb5_context context, krb5_enctype enctype,
krb5_keyblock *key, Key *hkey)
{
krb5_error_code ret;
ret = krb5_generate_random_keyblock (context, enctype, key);
if (ret)
return ret;
return krb5_copy_keyblock_contents (context, key, &hkey->key);
}
/* /*
* Set the keys of `ent' to random keys and return them in `n_keys' * Set the keys of `ent' to random keys and return them in `n_keys'
* and `new_keys'. * and `new_keys'.
@@ -426,7 +443,11 @@ _kadm5_set_keys_randomly (kadm5_server_context *context,
krb5_keyblock *keys; krb5_keyblock *keys;
Key *hkeys; Key *hkeys;
#ifdef ENABLE_AES
len = n_des_types + 2;
#else
len = n_des_types + 1; len = n_des_types + 1;
#endif
keys = malloc (len * sizeof(*keys)); keys = malloc (len * sizeof(*keys));
if (keys == NULL) if (keys == NULL)
return ENOMEM; return ENOMEM;
@@ -444,15 +465,7 @@ _kadm5_set_keys_randomly (kadm5_server_context *context,
_kadm5_init_keys (hkeys, len); _kadm5_init_keys (hkeys, len);
ret = krb5_generate_random_keyblock (context->context, ret = gen_random_key(context->context, des_types[0], &keys[0], &hkeys[0]);
des_types[0],
&keys[0]);
if (ret)
goto out;
ret = krb5_copy_keyblock_contents (context->context,
&keys[0],
&hkeys[0].key);
if (ret) if (ret)
goto out; goto out;
@@ -471,17 +484,19 @@ _kadm5_set_keys_randomly (kadm5_server_context *context,
hkeys[i].key.keytype = des_types[i]; hkeys[i].key.keytype = des_types[i];
} }
ret = krb5_generate_random_keyblock (context->context, ret = gen_random_key(context->context, ETYPE_DES3_CBC_SHA1,
ETYPE_DES3_CBC_SHA1, &keys[n_des_types],
&keys[n_des_types]); &hkeys[n_des_types]);
if (ret) if (ret)
goto out; goto out;
ret = krb5_copy_keyblock_contents (context->context, #ifdef ENABLE_AES
&keys[n_des_types], ret = gen_random_key(context->context, ETYPE_AES256_CTS_HMAC_SHA1_96,
&hkeys[n_des_types].key); &keys[n_des_types + 2],
&hkeys[n_des_types + 2]);
if (ret) if (ret)
goto out; goto out;
#endif
_kadm5_free_keys (context, ent->keys.len, ent->keys.val); _kadm5_free_keys (context, ent->keys.len, ent->keys.val);
ent->keys.len = len; ent->keys.len = len;