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

Initial support for default_{as, tgs}_etypes.

Browse Source 
Signed-off-by: Love Hörnquist Åstrand <lha@h5l.org>
This commit is contained in:
Nicolas Williams
2011-04-07 20:55:09 -05:00
committed by Love Hörnquist Åstrand
parent c06d5ebfda
commit 2fbad6432b
6 changed files with 42 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/krb5/build_auth.c
View File

@@ -44,7 +44,8 @@ make_etypelist(krb5_context context,
size_t len = 0;
size_t buf_size;
ret = krb5_init_etype(context, &etypes.len, &etypes.val, NULL);
ret = krb5_init_etype(context, KRB5_PDU_NONE, &etypes.len, &etypes.val,
NULL);
if (ret)
return ret;

28
lib/krb5/context.c
View File

@@ -34,6 +34,7 @@
*/
#include "krb5_locl.h"
#include <assert.h>
#include <com_err.h>
#define INIT_FIELD(C, T, E, D, F) \
@@ -431,7 +432,7 @@ KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
krb5_get_permitted_enctypes(krb5_context context,
krb5_enctype **etypes)
{
return krb5_get_default_in_tkt_etypes(context, etypes);
return krb5_get_default_in_tkt_etypes(context, KRB5_PDU_NONE, etypes);
}
/*
@@ -989,21 +990,33 @@ krb5_set_default_in_tkt_etypes(krb5_context context,
KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
krb5_get_default_in_tkt_etypes(krb5_context context,
krb5_pdu pdu_type,
krb5_enctype **etypes)
{
krb5_enctype *enctypes;
krb5_enctype *p;
int i;
krb5_error_code ret;
if(context->etypes) {
for(i = 0; context->etypes[i]; i++);
assert(pdu_type == KRB5_PDU_AS_REQUEST || pdu_type == KRB5_PDU_TGS_REQUEST
|| pdu_type == KRB5_PDU_NONE);
if (pdu_type == KRB5_PDU_AS_REQUEST && context->as_etypes != NULL)
enctypes = context->as_etypes;
else if (pdu_type == KRB5_PDU_TGS_REQUEST && context->tgs_etypes != NULL)
enctypes = context->tgs_etypes;
else if (context->etypes != NULL)
enctypes = context->etypes;
if (enctypes != NULL) {
for (i = 0; enctypes[i]; i++);
++i;
ALLOC(p, i);
if(!p) {
ALLOC (p, i);
if (!p) {
krb5_set_error_message (context, ENOMEM, N_("malloc: out of memory", ""));
return ENOMEM;
}
memmove(p, context->etypes, i * sizeof(krb5_enctype));
memmove(p, enctypes, i * sizeof(krb5_enctype));
} else {
ret = default_etypes(context, &p);
if (ret)
@@ -1424,6 +1437,7 @@ krb5_set_max_time_skew (krb5_context context, time_t t)
KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
krb5_init_etype (krb5_context context,
krb5_pdu pdu_type,
unsigned *len,
krb5_enctype **val,
const krb5_enctype *etypes)
@@ -1434,7 +1448,7 @@ krb5_init_etype (krb5_context context,
ret = 0;
if (etypes == NULL) {
ret = krb5_get_default_in_tkt_etypes(context, &tmp);
ret = krb5_get_default_in_tkt_etypes(context, pdu_type, &tmp);
if (ret)
return ret;
etypes = tmp;

1
lib/krb5/get_cred.c
View File

@@ -167,6 +167,7 @@ init_tgs_req (krb5_context context,
t->req_body.etype.val[0] = in_creds->session.keytype;
} else {
ret = krb5_init_etype(context,
KRB5_PDU_TGS_REQUEST,
&t->req_body.etype.len,
&t->req_body.etype.val,
NULL);

1
lib/krb5/get_in_tkt.c
View File

@@ -208,6 +208,7 @@ init_as_req (krb5_context context,
}
a->req_body.nonce = nonce;
ret = krb5_init_etype (context,
KRB5_PDU_AS_REQUEST,
&a->req_body.etype.len,
&a->req_body.etype.val,
etypes);

1
lib/krb5/init_creds_pw.c
View File

@@ -672,6 +672,7 @@ init_as_req (krb5_context context,
}
a->req_body.nonce = 0;
ret = krb5_init_etype (context,
KRB5_PDU_AS_REQUEST,
&a->req_body.etype.len,
&a->req_body.etype.val,
etypes);

16
lib/krb5/krb5.h
View File

@@ -165,6 +165,22 @@ enum {
};
/* PDU types */
typedef enum krb5_pdu {
KRB5_PDU_ERROR = 0,
KRB5_PDU_TICKET = 1,
KRB5_PDU_AS_REQUEST = 2,
KRB5_PDU_AS_REPLY = 3,
KRB5_PDU_TGS_REQUEST = 4,
KRB5_PDU_TGS_REPLY = 5,
KRB5_PDU_AP_REQUEST = 6,
KRB5_PDU_AP_REPLY = 7,
KRB5_PDU_KRB_SAFE = 8,
KRB5_PDU_KRB_PRIV = 9,
KRB5_PDU_KRB_CRED = 10,
KRB5_PDU_NONE = 11 /* See krb5_get_permitted_enctypes() */
} krb5_pdu;
typedef PADATA_TYPE krb5_preauthtype;
typedef enum krb5_key_usage {