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

ifdef protect label that is only uesd with pkinit

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@13451 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2004-03-07 16:40:58 +00:00
parent 67901aee54
commit 60e6ffb478
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
kdc/kerberos5.c
View File

@@ -410,8 +410,8 @@ make_etype_info2_entry(ETYPE_INFO2_ENTRY *ent, Key *key)
ent->s2kparams->data = malloc(ent->s2kparams->length); ent->s2kparams->data = malloc(ent->s2kparams->length);
if (ent->s2kparams->data == NULL) if (ent->s2kparams->data == NULL)
return ENOMEM; return ENOMEM;
_krb5_put_int(ent->s2kparams->data, _krb5_put_int(ent->s2kparams->data,
_krb5_AES_string_to_default_iterator, _krb5_AES_string_to_default_iterator,
ent->s2kparams->length); ent->s2kparams->length);
break; break;
#endif #endif
@@ -473,12 +473,13 @@ get_pa_etype_info2(METHOD_DATA *md, hdb_entry *client,
for(j = 0; j < etypes_len; j++) { for(j = 0; j < etypes_len; j++) {
for(i = 0; i < client->keys.len; i++) { for(i = 0; i < client->keys.len; i++) {
if(client->keys.val[i].key.keytype == etypes[j]) if(client->keys.val[i].key.keytype == etypes[j]) {
if((ret = make_etype_info2_entry(&pa.val[n++], if((ret = make_etype_info2_entry(&pa.val[n++],
&client->keys.val[i])) != 0) { &client->keys.val[i])) != 0) {
free_ETYPE_INFO2(&pa); free_ETYPE_INFO2(&pa);
return ret; return ret;
} }
}
} }
} }
for(i = 0; i < client->keys.len; i++) { for(i = 0; i < client->keys.len; i++) {
@@ -486,7 +487,7 @@ get_pa_etype_info2(METHOD_DATA *md, hdb_entry *client,
if(client->keys.val[i].key.keytype == etypes[j]) if(client->keys.val[i].key.keytype == etypes[j])
goto skip; goto skip;
} }
if((ret = make_etype_info2_entry(&pa.val[n++], if((ret = make_etype_info2_entry(&pa.val[n++],
&client->keys.val[i])) != 0) { &client->keys.val[i])) != 0) {
free_ETYPE_INFO2(&pa); free_ETYPE_INFO2(&pa);
return ret; return ret;
@@ -841,7 +842,9 @@ as_rep(KDC_REQ *req,
client_name); client_name);
break; break;
} }
#ifdef PKINIT
preauth_done: preauth_done:
#endif
if(found_pa == 0 && require_preauth) if(found_pa == 0 && require_preauth)
goto use_pa; goto use_pa;
/* We come here if we found a pa-enc-timestamp, but if there /* We come here if we found a pa-enc-timestamp, but if there