summaryrefslogtreecommitdiffstats
path: root/src/include/k5-int.h
diff options
context:
space:
mode:
authorSam Hartman <hartmans@mit.edu>2003-05-12 02:59:06 +0000
committerSam Hartman <hartmans@mit.edu>2003-05-12 02:59:06 +0000
commitb7d2f686d8c563ab64636974d64b5fae92ad1766 (patch)
treef4e69e6922c7ffa87a633a5caf3ef8c018ae23a7 /src/include/k5-int.h
parent57a21011ff605a03c3ae5d021c4a0c2ef8361b4c (diff)
downloadkrb5-b7d2f686d8c563ab64636974d64b5fae92ad1766.tar.gz
krb5-b7d2f686d8c563ab64636974d64b5fae92ad1766.tar.xz
krb5-b7d2f686d8c563ab64636974d64b5fae92ad1766.zip
* IMplement etype_info in KDC. If the request contains any new
enctypes (currently AES but anything not explicitly listed as old) then only etype_info2 is sent back in response. Send back etype_info2 all the time. Also send back etype_info2 to provide salt and s2kparams with AS reply not just for preauth errors. * Expose interface for getting string2key with parameters (previously implemented but not exported) * IN the client (at least for get_init_creds interface) prfer etype_info2 to etype_info and pw_salt. Pass s2kparams and use string2key_with_params. Ticket: 1454 Status: open Target_Version: 1.3 git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@15412 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/include/k5-int.h')
-rw-r--r--src/include/k5-int.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/include/k5-int.h b/src/include/k5-int.h
index 596784bef..b9f8722c1 100644
--- a/src/include/k5-int.h
+++ b/src/include/k5-int.h
@@ -914,6 +914,7 @@ typedef krb5_error_code (*krb5_gic_get_as_key_fct)
krb5_prompter_fct,
void *prompter_data,
krb5_data *salt,
+ krb5_data *s2kparams,
krb5_keyblock *as_key,
void *gak_data);
@@ -936,7 +937,8 @@ krb5_get_init_creds
krb5_error_code krb5_do_preauth
(krb5_context, krb5_kdc_req *,
krb5_pa_data **, krb5_pa_data ***,
- krb5_data *, krb5_enctype *,
+ krb5_data *salt, krb5_data *s2kparams,
+ krb5_enctype *,
krb5_keyblock *,
krb5_prompter_fct, void *,
krb5_gic_get_as_key_fct, void *);