From 24b09630d34ae7f3e9a16e6011f50dbd8282e5ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= Date: Tue, 2 Sep 2003 20:51:48 +0000 Subject: [PATCH] add SAM keyusage numbers add s2k proc typedef add a pointer to a private part of krb5_get_init_creds_opt git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@12723 ec53bebd-3082-4978-b11e-865c3cabbd6b --- lib/krb5/krb5.h | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/lib/krb5/krb5.h b/lib/krb5/krb5.h index 34de5ac8c..e044fd654 100644 --- a/lib/krb5/krb5.h +++ b/lib/krb5/krb5.h @@ -184,9 +184,13 @@ typedef enum krb5_key_usage { KRB5_KU_USAGE_ACCEPTOR_SIGN = 23, /* acceptor seal in GSSAPI CFX krb5 mechanism */ KRB5_KU_USAGE_INITIATOR_SEAL = 24, - /* initiator sign in GSSAPI CFX krb5 mechanism */ - KRB5_KU_USAGE_INITIATOR_SIGN = 25 - /* initiator seal in GSSAPI CFX krb5 mechanism */ + /* initiator sign in GSSAPI CFX krb5 mechanism */ + KRB5_KU_USAGE_INITIATOR_SIGN = 25, + /* initiator seal in GSSAPI CFX krb5 mechanism */ + KRB5_KU_SAM_CHECKSUM = 25, + /* Checksum for the SAM-CHECKSUM field */ + KRB5_KU_SAM_ENC_TRACK_ID = 26 + /* Encryption of the SAM-TRACK-ID field */ } krb5_key_usage; typedef krb5_key_usage krb5_keyusage; @@ -582,7 +586,6 @@ typedef int (*krb5_prompter_fct)(krb5_context context, const char *banner, int num_prompts, krb5_prompt prompts[]); - typedef krb5_error_code (*krb5_key_proc)(krb5_context context, krb5_enctype type, krb5_salt salt, @@ -593,7 +596,14 @@ typedef krb5_error_code (*krb5_decrypt_proc)(krb5_context context, krb5_key_usage usage, krb5_const_pointer decrypt_arg, krb5_kdc_rep *dec_rep); +typedef krb5_error_code (*krb5_s2k_proc)(krb5_context context, + krb5_enctype type, + krb5_const_pointer keyseed, + krb5_salt salt, + krb5_data *s2kparms, + krb5_keyblock **key); +struct _krb5_get_init_creds_opt_private; typedef struct _krb5_get_init_creds_opt { krb5_flags flags; @@ -605,14 +615,12 @@ typedef struct _krb5_get_init_creds_opt { krb5_enctype *etype_list; int etype_list_length; krb5_addresses *address_list; -#if 0 /* this is the MIT-way */ - krb5_address **address_list; -#endif /* XXX the next three should not be used, as they may be removed later */ krb5_preauthtype *preauth_list; int preauth_list_length; krb5_data *salt; + struct _krb5_get_init_creds_opt_private *private; } krb5_get_init_creds_opt; #define KRB5_GET_INIT_CREDS_OPT_TKT_LIFE 0x0001