diff options
| author | Sam Hartman <hartmans@mit.edu> | 2003-05-12 02:59:06 +0000 |
|---|---|---|
| committer | Sam Hartman <hartmans@mit.edu> | 2003-05-12 02:59:06 +0000 |
| commit | b7d2f686d8c563ab64636974d64b5fae92ad1766 (patch) | |
| tree | f4e69e6922c7ffa87a633a5caf3ef8c018ae23a7 /src/include | |
| parent | 57a21011ff605a03c3ae5d021c4a0c2ef8361b4c (diff) | |
| download | krb5-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')
| -rw-r--r-- | src/include/ChangeLog | 10 | ||||
| -rw-r--r-- | src/include/k5-int.h | 4 | ||||
| -rw-r--r-- | src/include/krb5.hin | 9 |
3 files changed, 21 insertions, 2 deletions
diff --git a/src/include/ChangeLog b/src/include/ChangeLog index 00f359f4a0..58a85676d1 100644 --- a/src/include/ChangeLog +++ b/src/include/ChangeLog @@ -1,3 +1,13 @@ +2003-05-08 Sam Hartman <hartmans@mit.edu> + + * krb5.hin: Add prototype for krb5_c_string_to_key_with_params + + * k5-int.h: Add s2kparams to krb5_gic_get_as_key_fct + +2003-05-07 Sam Hartman <hartmans@mit.edu> + + * krb5.hin: Add KRB5_PADATA_ETYPE_INFO2 + 2003-05-09 Ken Raeburn <raeburn@mit.edu> * k5-int.h (struct _krb5_context): New fields conf_tgs_ktypes, diff --git a/src/include/k5-int.h b/src/include/k5-int.h index 596784bef3..b9f8722c1a 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 *); diff --git a/src/include/krb5.hin b/src/include/krb5.hin index c1f66cb3ee..7d033902c9 100644 --- a/src/include/krb5.hin +++ b/src/include/krb5.hin @@ -491,6 +491,13 @@ krb5_error_code KRB5_CALLCONV (krb5_context context, krb5_enctype enctype, const krb5_data *string, const krb5_data *salt, krb5_keyblock *key); +krb5_error_code KRB5_CALLCONV +krb5_c_string_to_key_with_params(krb5_context context, + krb5_enctype enctype, + const krb5_data *string, + const krb5_data *salt, + const krb5_data *params, + krb5_keyblock *key); krb5_error_code KRB5_CALLCONV krb5_c_enctype_compare @@ -874,7 +881,7 @@ krb5_error_code krb5_decrypt_data #define KRB5_PADATA_SAM_RESPONSE 13 /* draft challenge system response */ #define KRB5_PADATA_PK_AS_REQ 14 /* PKINIT */ #define KRB5_PADATA_PK_AS_REP 15 /* PKINIT */ - +#define KRB5_PADATA_ETYPE_INFO2 19 #define KRB5_PADATA_SAM_CHALLENGE_2 30 /* draft challenge system, updated */ #define KRB5_PADATA_SAM_RESPONSE_2 31 /* draft challenge system, updated */ |