use krb5_enctype consistently. From Ben Harris <bjh21@netbsd.org>
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@10804 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -38,7 +38,7 @@ RCSID("$Id$");
|
||||
krb5_error_code
|
||||
krb5_init_etype (krb5_context context,
|
||||
unsigned *len,
|
||||
int **val,
|
||||
krb5_enctype **val,
|
||||
const krb5_enctype *etypes)
|
||||
{
|
||||
int i;
|
||||
@@ -58,7 +58,7 @@ krb5_init_etype (krb5_context context,
|
||||
for (i = 0; tmp[i]; ++i)
|
||||
;
|
||||
*len = i;
|
||||
*val = malloc(i * sizeof(int));
|
||||
*val = malloc(i * sizeof(**val));
|
||||
if (i != 0 && *val == NULL) {
|
||||
ret = ENOMEM;
|
||||
krb5_set_error_string(context, "malloc: out of memory");
|
||||
@@ -370,14 +370,14 @@ add_padata(krb5_context context,
|
||||
krb5_principal client,
|
||||
krb5_key_proc key_proc,
|
||||
krb5_const_pointer keyseed,
|
||||
int *enctypes,
|
||||
krb5_enctype *enctypes,
|
||||
unsigned netypes,
|
||||
krb5_salt *salt)
|
||||
{
|
||||
krb5_error_code ret;
|
||||
PA_DATA *pa2;
|
||||
krb5_salt salt2;
|
||||
int *ep;
|
||||
krb5_enctype *ep;
|
||||
int i;
|
||||
|
||||
if(salt == NULL) {
|
||||
@@ -386,7 +386,7 @@ add_padata(krb5_context context,
|
||||
salt = &salt2;
|
||||
}
|
||||
if (!enctypes) {
|
||||
enctypes = (int *)context->etypes; /* XXX */
|
||||
enctypes = context->etypes;
|
||||
netypes = 0;
|
||||
for (ep = enctypes; *ep != ETYPE_NULL; ep++)
|
||||
netypes++;
|
||||
|
Reference in New Issue
Block a user