k5-int.h: Add new prototypes and #define's provided by Frank Cusack's

	preauth patch (PR# [krb5-kdc/662])

krb5.hin (krb5_prompter_fct, krb5_prompter_posix): Update function
	prototypes to reflect new prompter prototype which takes an extra
	argument for the window titlebar name.  (From Frank Cusack)
	[krb5-kdc/662]

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@11347 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/include/ChangeLog b/src/include/ChangeLog
index 4904ef3bdbaa0c45c5a0df41ef0d2828a1784998..1feb4348db15f4d088fe004261bb7b10e554b1fe 100644 (file)
--- a/src/include/ChangeLog
+++ b/src/include/ChangeLog
@@ -1,3 +1,15 @@
+1999-04-09  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * k5-int.h: Add new prototypes and #define's provided by Frank
+               Cusack's preauth patch (PR# [krb5-kdc/662])
+
+1999-04-01  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * krb5.hin (krb5_prompter_fct, krb5_prompter_posix): Update
+               function prototypes to reflect new prompter prototype
+               which takes an extra argument for the window titlebar
+               name.  (From Frank Cusack) [krb5-kdc/662]
+
 Mon Mar 15 15:57:41 1999  Tom Yu  <tlyu@mit.edu>
 
        * k5-int.h: Fix GSS_DLLIMP.

diff --git a/src/include/k5-int.h b/src/include/k5-int.h
index ee26248b49bdd9e093094908cf607b303c53213d..758fb6b9ed112cb3923d03171e3094f24be6ea8d 100644 (file)
--- a/src/include/k5-int.h
+++ b/src/include/k5-int.h
@@ -75,6 +75,9 @@
 
 #include "osconf.h"
 
+/* Compatibility switch for SAM preauth */
+#define AS_REP_105_SAM_COMPAT
+
 /*
  * Begin "k5-config.h"
  */
@@ -331,9 +334,12 @@ typedef krb5_etype_info_entry ** krb5_etype_info;
 #define PA_SAM_TYPE_SKEY_K0    3   /*  S/key where  KDC has key 0 */
 #define PA_SAM_TYPE_SKEY       4   /*  Traditional S/Key */
 #define PA_SAM_TYPE_SECURID    5   /*  Security Dynamics */
+#define PA_SAM_TYPE_CRYPTOCARD 6   /*  CRYPTOCard */
+#if 1 /* XXX need to figure out who has which numbers assigned */
 #define PA_SAM_TYPE_ACTIVCARD_DEC  6   /*  ActivCard decimal mode */
 #define PA_SAM_TYPE_ACTIVCARD_HEX  7   /*  ActivCard hex mode */
 #define PA_SAM_TYPE_DIGI_PATH_HEX  8   /*  Digital Pathways hex mode */
+#endif
 #define PA_SAM_TYPE_EXP_BASE    128 /* experimental */
 #define PA_SAM_TYPE_GRAIL              (PA_SAM_TYPE_EXP_BASE+0) /* testing */
 #define PA_SAM_TYPE_SECURID_PREDICT    (PA_SAM_TYPE_EXP_BASE+1) /* special */
@@ -940,6 +946,25 @@ KRB5_PROTOTYPE((krb5_context, krb5_kdc_req *,
                krb5_prompter_fct, void *,
                krb5_gic_get_as_key_fct, void *));
 
+KRB5_DLLIMP void KRB5_CALLCONV krb5_free_sam_challenge
+       KRB5_PROTOTYPE((krb5_context, krb5_sam_challenge FAR * ));
+KRB5_DLLIMP void KRB5_CALLCONV krb5_free_sam_response
+       KRB5_PROTOTYPE((krb5_context, krb5_sam_response FAR * ));
+KRB5_DLLIMP void KRB5_CALLCONV krb5_free_predicted_sam_response
+       KRB5_PROTOTYPE((krb5_context, krb5_predicted_sam_response FAR * ));
+KRB5_DLLIMP void KRB5_CALLCONV krb5_free_enc_sam_response_enc
+       KRB5_PROTOTYPE((krb5_context, krb5_enc_sam_response_enc FAR * ));
+KRB5_DLLIMP void KRB5_CALLCONV krb5_free_sam_challenge_contents
+       KRB5_PROTOTYPE((krb5_context, krb5_sam_challenge FAR * ));
+KRB5_DLLIMP void KRB5_CALLCONV krb5_free_sam_response_contents
+       KRB5_PROTOTYPE((krb5_context, krb5_sam_response FAR * ));
+KRB5_DLLIMP void KRB5_CALLCONV krb5_free_predicted_sam_response_contents
+       KRB5_PROTOTYPE((krb5_context, krb5_predicted_sam_response FAR * ));
+KRB5_DLLIMP void KRB5_CALLCONV krb5_free_enc_sam_response_enc_contents
+       KRB5_PROTOTYPE((krb5_context, krb5_enc_sam_response_enc FAR * ));
+ 
+KRB5_DLLIMP void KRB5_CALLCONV krb5_free_pa_enc_ts
+       KRB5_PROTOTYPE((krb5_context, krb5_pa_enc_ts FAR *));
 
 /* #include "krb5/wordsize.h" -- comes in through base-defs.h. */
 #include "profile.h"

diff --git a/src/include/krb5.hin b/src/include/krb5.hin
index 872753b18a54bd11def11fd65f90dfc7b0cf5076..e4e12f2f0ef67086b25e14e7d071e2242d9fd898 100644 (file)
--- a/src/include/krb5.hin
+++ b/src/include/krb5.hin
@@ -2235,6 +2235,7 @@ typedef struct _krb5_prompt {
 
 typedef krb5_error_code (KRB5_CALLCONV *krb5_prompter_fct)(krb5_context context,
                                             void *data,
+                                            const char *name,
                                             const char *banner,
                                             int num_prompts,
                                             krb5_prompt prompts[]);
@@ -2244,6 +2245,7 @@ KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_prompter_posix
 KRB5_PROTOTYPE((krb5_context context,
                void *data,
+               const char *name,
                const char *banner,
                int num_prompts,
                krb5_prompt prompts[]));