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

use krb5_enctype consistently. From Ben Harris <bjh21@netbsd.org>

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@10804 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
2002-01-06 23:10:06 +00:00
parent 803dd71fde
commit 9f1c66fe5f
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
kdc/kerberos5.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1997-2001 Kungliga Tekniska H<>gskolan * Copyright (c) 1997-2002 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden). * (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved. * All rights reserved.
* *
@@ -109,7 +109,7 @@ find_keys(hdb_entry *client,
krb5_enctype *cetype, krb5_enctype *cetype,
Key **skey, Key **skey,
krb5_enctype *setype, krb5_enctype *setype,
int *etypes, krb5_enctype *etypes,
unsigned num_etypes) unsigned num_etypes)
{ {
krb5_error_code ret; krb5_error_code ret;

12
lib/krb5/crypto.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1997 - 2001 Kungliga Tekniska H<>gskolan * Copyright (c) 1997 - 2002 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden). * (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved. * All rights reserved.
* *
@@ -2173,18 +2173,18 @@ krb5_error_code
krb5_keytype_to_enctypes (krb5_context context, krb5_keytype_to_enctypes (krb5_context context,
krb5_keytype keytype, krb5_keytype keytype,
unsigned *len, unsigned *len,
int **val) krb5_enctype **val)
{ {
int i; int i;
unsigned n = 0; unsigned n = 0;
int *ret; krb5_enctype *ret;
for (i = num_etypes - 1; i >= 0; --i) { for (i = num_etypes - 1; i >= 0; --i) {
if (etypes[i]->keytype->type == keytype if (etypes[i]->keytype->type == keytype
&& !(etypes[i]->flags & F_PSEUDO)) && !(etypes[i]->flags & F_PSEUDO))
++n; ++n;
} }
ret = malloc(n * sizeof(int)); ret = malloc(n * sizeof(*ret));
if (ret == NULL && n != 0) { if (ret == NULL && n != 0) {
krb5_set_error_string(context, "malloc: out of memory"); krb5_set_error_string(context, "malloc: out of memory");
return ENOMEM; return ENOMEM;
@@ -2209,10 +2209,10 @@ krb5_error_code
krb5_keytype_to_enctypes_default (krb5_context context, krb5_keytype_to_enctypes_default (krb5_context context,
krb5_keytype keytype, krb5_keytype keytype,
unsigned *len, unsigned *len,
int **val) krb5_enctype **val)
{ {
int i, n; int i, n;
int *ret; krb5_enctype *ret;
if (keytype != KEYTYPE_DES || context->etypes_des == NULL) if (keytype != KEYTYPE_DES || context->etypes_des == NULL)
return krb5_keytype_to_enctypes (context, keytype, len, val); return krb5_keytype_to_enctypes (context, keytype, len, val);

10
lib/krb5/get_in_tkt.c
View File

@@ -38,7 +38,7 @@ RCSID("$Id$");
krb5_error_code krb5_error_code
krb5_init_etype (krb5_context context, krb5_init_etype (krb5_context context,
unsigned *len, unsigned *len,
int **val, krb5_enctype **val,
const krb5_enctype *etypes) const krb5_enctype *etypes)
{ {
int i; int i;
@@ -58,7 +58,7 @@ krb5_init_etype (krb5_context context,
for (i = 0; tmp[i]; ++i) for (i = 0; tmp[i]; ++i)
; ;
*len = i; *len = i;
*val = malloc(i * sizeof(int)); *val = malloc(i * sizeof(**val));
if (i != 0 && *val == NULL) { if (i != 0 && *val == NULL) {
ret = ENOMEM; ret = ENOMEM;
krb5_set_error_string(context, "malloc: out of memory"); krb5_set_error_string(context, "malloc: out of memory");
@@ -370,14 +370,14 @@ add_padata(krb5_context context,
krb5_principal client, krb5_principal client,
krb5_key_proc key_proc, krb5_key_proc key_proc,
krb5_const_pointer keyseed, krb5_const_pointer keyseed,
int *enctypes, krb5_enctype *enctypes,
unsigned netypes, unsigned netypes,
krb5_salt *salt) krb5_salt *salt)
{ {
krb5_error_code ret; krb5_error_code ret;
PA_DATA *pa2; PA_DATA *pa2;
krb5_salt salt2; krb5_salt salt2;
int *ep; krb5_enctype *ep;
int i; int i;
if(salt == NULL) { if(salt == NULL) {
@@ -386,7 +386,7 @@ add_padata(krb5_context context,
salt = &salt2; salt = &salt2;
} }
if (!enctypes) { if (!enctypes) {
enctypes = (int *)context->etypes; /* XXX */ enctypes = context->etypes;
netypes = 0; netypes = 0;
for (ep = enctypes; *ep != ETYPE_NULL; ep++) for (ep = enctypes; *ep != ETYPE_NULL; ep++)
netypes++; netypes++;