aboutsummaryrefslogtreecommitdiff
path: root/lib/libgssapi/mech_switch.h
diff options
context:
space:
mode:
authorDoug Rabson <dfr@FreeBSD.org>2008-05-07 13:53:12 +0000
committerDoug Rabson <dfr@FreeBSD.org>2008-05-07 13:53:12 +0000
commit33f12199250a09b573f7a518b523fdac3f120b8f (patch)
tree1338a6c0e5d3e7c3b0da720ac15cd79fc72c6b5a /lib/libgssapi/mech_switch.h
parent4fe54d7c6acb302aacc6ac18798804b26c882c13 (diff)
downloadsrc-33f12199250a09b573f7a518b523fdac3f120b8f.tar.gz
src-33f12199250a09b573f7a518b523fdac3f120b8f.zip
Fix conflicts after heimdal-1.1 import and add build infrastructure. Import
all non-style changes made by heimdal to our own libgssapi.
Notes
Notes: svn path=/head/; revision=178828
Diffstat (limited to 'lib/libgssapi/mech_switch.h')
-rw-r--r--lib/libgssapi/mech_switch.h53
1 files changed, 40 insertions, 13 deletions
diff --git a/lib/libgssapi/mech_switch.h b/lib/libgssapi/mech_switch.h
index 4add12d8af10..876adcda9e64 100644
--- a/lib/libgssapi/mech_switch.h
+++ b/lib/libgssapi/mech_switch.h
@@ -26,6 +26,7 @@
* $FreeBSD$
*/
+#include <unistd.h>
#include <sys/queue.h>
typedef OM_uint32 _gss_acquire_cred_t
@@ -266,24 +267,46 @@ typedef OM_uint32 _gss_duplicate_name_t (
gss_name_t * /* dest_name */
);
-typedef OM_uint32 _gsskrb5_register_acceptor_identity (
- const char * /* identity */
+typedef OM_uint32 _gss_inquire_sec_context_by_oid
+ (OM_uint32 *, /* minor_status */
+ const gss_ctx_id_t, /* context_handle */
+ const gss_OID, /* desired_object */
+ gss_buffer_set_t * /* result */
);
-typedef OM_uint32 _gss_krb5_copy_ccache (
- OM_uint32 *, /* minor_status */
- gss_cred_id_t, /* cred_handle */
- struct krb5_ccache_data * /* out */
+typedef OM_uint32 _gss_inquire_cred_by_oid
+ (OM_uint32 *, /* bminor_status */
+ const gss_cred_id_t, /* cred_handle, */
+ const gss_OID, /* desired_object */
+ gss_buffer_set_t * /* data_set */
);
-typedef OM_uint32 _gss_krb5_compat_des3_mic (
- OM_uint32 *, /* minor_status */
- gss_ctx_id_t, /* context_handle */
- int /* flag */
+typedef OM_uint32 _gss_set_sec_context_option
+ (OM_uint32 *, /* minor status */
+ gss_ctx_id_t *, /* context */
+ const gss_OID, /* option to set */
+ const gss_buffer_t /* option value */
+ );
+
+typedef OM_uint32 _gss_set_cred_option
+ (OM_uint32 *, /* minor status */
+ gss_cred_id_t *, /* cred */
+ const gss_OID, /* option to set */
+ const gss_buffer_t /* option value */
+ );
+
+typedef OM_uint32 _gss_pseudo_random
+ (OM_uint32 *, /* minor status */
+ gss_ctx_id_t, /* context */
+ int, /* PRF key */
+ const gss_buffer_t, /* PRF input */
+ ssize_t, /* desired output length */
+ gss_buffer_t /* PRF output */
);
struct _gss_mech_switch {
SLIST_ENTRY(_gss_mech_switch) gm_link;
+ const char *gm_name_prefix;
gss_OID_desc gm_mech_oid;
void *gm_so;
_gss_acquire_cred_t *gm_acquire_cred;
@@ -315,9 +338,11 @@ struct _gss_mech_switch {
_gss_inquire_mechs_for_name_t *gm_inquire_mechs_for_name;
_gss_canonicalize_name_t *gm_canonicalize_name;
_gss_duplicate_name_t *gm_duplicate_name;
- _gsskrb5_register_acceptor_identity *gm_krb5_register_acceptor_identity;
- _gss_krb5_copy_ccache *gm_krb5_copy_ccache;
- _gss_krb5_compat_des3_mic *gm_krb5_compat_des3_mic;
+ _gss_inquire_sec_context_by_oid *gm_inquire_sec_context_by_oid;
+ _gss_inquire_cred_by_oid *gm_inquire_cred_by_oid;
+ _gss_set_sec_context_option *gm_set_sec_context_option;
+ _gss_set_cred_option *gm_set_cred_option;
+ _gss_pseudo_random *gm_pseudo_random;
};
SLIST_HEAD(_gss_mech_switch_list, _gss_mech_switch);
extern struct _gss_mech_switch_list _gss_mechs;
@@ -325,3 +350,5 @@ extern gss_OID_set _gss_mech_oids;
extern void _gss_load_mech(void);
extern struct _gss_mech_switch *_gss_find_mech_switch(gss_OID);
+extern void _gss_mg_error(struct _gss_mech_switch *m, OM_uint32 maj,
+ OM_uint32 min);