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

use krb5_generate_subkey_extended()

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@14452 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Luke Howard
2005-01-05 02:34:08 +00:00
parent 847cb0fa5b
commit 52594dcc54
2 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/krb5/auth_context.c
View File

@@ -322,7 +322,9 @@ krb5_auth_con_generatelocalsubkey(krb5_context context,
krb5_error_code ret; krb5_error_code ret;
krb5_keyblock *subkey; krb5_keyblock *subkey;
ret = krb5_generate_subkey (context, key, &subkey); ret = krb5_generate_subkey_extended (context, key,
auth_context->keytype,
&subkey);
if(ret) if(ret)
return ret; return ret;
if(auth_context->local_subkey) if(auth_context->local_subkey)

18
lib/krb5/generate_subkey.c
View File

@@ -39,6 +39,15 @@ krb5_error_code KRB5_LIB_FUNCTION
krb5_generate_subkey(krb5_context context, krb5_generate_subkey(krb5_context context,
const krb5_keyblock *key, const krb5_keyblock *key,
krb5_keyblock **subkey) krb5_keyblock **subkey)
{
return krb5_generate_subkey_extended(context, key, key->keytype, subkey);
}
krb5_error_code KRB5_LIB_FUNCTION
krb5_generate_subkey_extended(krb5_context context,
const krb5_keyblock *key,
krb5_enctype etype,
krb5_keyblock **subkey)
{ {
krb5_error_code ret; krb5_error_code ret;
@@ -47,8 +56,15 @@ krb5_generate_subkey(krb5_context context,
krb5_set_error_string(context, "malloc: out of memory"); krb5_set_error_string(context, "malloc: out of memory");
return ENOMEM; return ENOMEM;
} }
ret = krb5_generate_random_keyblock(context, key->keytype, *subkey);
if (etype == ETYPE_NULL)
etype = key->keytype; /* use session key etype */
/* XXX should we use the session key as input to the RF? */
ret = krb5_generate_random_keyblock(context, etype, *subkey);
if(ret) if(ret)
free(*subkey); free(*subkey);
return ret; return ret;
} }