diff options
| author | Sam Hartman <hartmans@mit.edu> | 2009-01-13 22:57:42 +0000 |
|---|---|---|
| committer | Sam Hartman <hartmans@mit.edu> | 2009-01-13 22:57:42 +0000 |
| commit | 919383c2c3c95973c3579e6730cdc5c077132c3d (patch) | |
| tree | 45ae25ad3cd684bc43aadac289c8d57952f00f17 /src/include | |
| parent | 671ceced3b5fec90cd2ad894a083d1b8b3d89997 (diff) | |
| download | krb5-919383c2c3c95973c3579e6730cdc5c077132c3d.tar.gz krb5-919383c2c3c95973c3579e6730cdc5c077132c3d.tar.xz krb5-919383c2c3c95973c3579e6730cdc5c077132c3d.zip | |
Patch from Luke Howard to:
* Accept both CFX and non-CFX tokens all the time on acceptor
* Only produce an acceptor subkey if you are using cfx or dce or negotiating up to cfx
Additional changes from Sam Hartman:
* do not assume that the ticket key type (server key) is a valid target for negotiation: the client may not support it.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@21742 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/k5-int.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/include/k5-int.h b/src/include/k5-int.h index 9ad55694e..072a4d397 100644 --- a/src/include/k5-int.h +++ b/src/include/k5-int.h @@ -1959,7 +1959,7 @@ void krb5int_free_srv_dns_data(struct srv_dns_entry *); /* To keep happy libraries which are (for now) accessing internal stuff */ /* Make sure to increment by one when changing the struct */ -#define KRB5INT_ACCESS_STRUCT_VERSION 12 +#define KRB5INT_ACCESS_STRUCT_VERSION 13 #ifndef ANAME_SZ struct ktext; /* from krb.h, for krb524 support */ @@ -1972,6 +1972,7 @@ typedef struct _krb5int_access { const krb5_keyblock *key, unsigned int icount, const krb5_data *input, krb5_data *output); + krb5_error_code (* krb5_auth_con_get_subkey_enctype)(krb5_context, krb5_auth_context, krb5_enctype *); /* service location and communication */ krb5_error_code (*sendto_udp) (krb5_context, const krb5_data *msg, const struct addrlist *, struct sendto_callback_info*, krb5_data *reply, @@ -2580,6 +2581,11 @@ krb5_error_code krb5_auth_con_getpermetypes krb5_auth_context, krb5_enctype **); +krb5_error_code krb5_auth_con_get_subkey_enctype + (krb5_context context, + krb5_auth_context, + krb5_enctype *); + krb5_error_code KRB5_CALLCONV krb5int_server_decrypt_ticket_keyblock (krb5_context context, |