merge new-crypto branch
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@5332 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1997 Kungliga Tekniska H<>gskolan
|
||||
* Copyright (c) 1997, 1998 Kungliga Tekniska H<>gskolan
|
||||
* (Royal Institute of Technology, Stockholm, Sweden).
|
||||
* All rights reserved.
|
||||
*
|
||||
@@ -46,17 +46,9 @@ krb5_generate_subkey(krb5_context context,
|
||||
krb5_keyblock **subkey)
|
||||
{
|
||||
krb5_error_code ret;
|
||||
krb5_keyblock *k;
|
||||
|
||||
k = malloc(sizeof(**subkey));
|
||||
if (k == NULL)
|
||||
return ENOMEM;
|
||||
|
||||
ret = krb5_generate_random_keyblock(context, key->keytype, k);
|
||||
if(ret){
|
||||
free(k);
|
||||
return ret;
|
||||
}
|
||||
*subkey = k;
|
||||
return 0;
|
||||
ALLOC(*subkey, 1);
|
||||
ret = krb5_generate_random_keyblock(context, key->keytype, *subkey);
|
||||
if(ret)
|
||||
free(*subkey);
|
||||
return ret;
|
||||
}
|
||||
|
Reference in New Issue
Block a user