diff options
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 00f359f4a..58a85676d 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 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 *); diff --git a/src/include/krb5.hin b/src/include/krb5.hin index c1f66cb3e..7d033902c 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 */ |