pull up r24469, r24530, r24533, r24534, r24535, r24537 from trunk

[krb5.git] / src / lib / gssapi / mechglue / mglueP.h

diff --git a/src/lib/gssapi/mechglue/mglueP.h b/src/lib/gssapi/mechglue/mglueP.h
index f35ac144742e1838b5db4a4782ee09f6107d5c11..3524ceae4840e2d77453d14bc677a4801023bf99 100644 (file)
--- a/src/lib/gssapi/mechglue/mglueP.h
+++ b/src/lib/gssapi/mechglue/mglueP.h
@@ -77,7 +77,6 @@ typedef struct gss_cred_id_struct {
 } gss_union_cred_desc, *gss_union_cred_t;
 
 typedef        OM_uint32           (*gss_acquire_cred_with_password_sfct)(
-                   void *,             /* context */
                    OM_uint32 *,        /* minor_status */
                    const gss_name_t,   /* desired_name */
                    const gss_buffer_t, /* password */
@@ -397,7 +396,7 @@ typedef struct gss_config {
        OM_uint32       (*gssspi_set_cred_option)
        (
                    OM_uint32 *,        /* minor_status */
-                   gss_cred_id_t,      /* cred_handle */
+                   gss_cred_id_t *,    /* cred_handle */
                    const gss_OID,      /* OID */
                    const gss_buffer_t  /* value */
                    );
@@ -573,11 +572,52 @@ typedef struct gss_config {
            gss_any_t *                 /* input */
        /* */);
 
+        OM_uint32       (*gss_pseudo_random)
+        (
+            OM_uint32 *,                /* minor_status */
+            gss_ctx_id_t,               /* context */
+            int,                        /* prf_key */
+            const gss_buffer_t,         /* prf_in */
+            ssize_t,                    /* desired_output_len */
+            gss_buffer_t                /* prf_out */
+        /* */);
+
+       OM_uint32       (*gss_set_neg_mechs)
+       (
+           OM_uint32 *,                /* minor_status */
+           gss_cred_id_t,              /* cred_handle */
+           const gss_OID_set           /* mech_set */
+       /* */);
+
+       OM_uint32       (*gss_inquire_saslname_for_mech)
+       (
+           OM_uint32 *,                /* minor_status */
+           const gss_OID,              /* desired_mech */
+           gss_buffer_t,               /* sasl_mech_name */
+           gss_buffer_t,               /* mech_name */
+           gss_buffer_t                /* mech_description */
+       /* */);
+
+       OM_uint32       (*gss_inquire_mech_for_saslname)
+       (
+           OM_uint32 *,                /* minor_status */
+           const gss_buffer_t,         /* sasl_mech_name */
+           gss_OID *                   /* mech_type */
+       /* */);
+
+       OM_uint32       (*gss_inquire_attrs_for_mech)
+       (
+           OM_uint32 *,                /* minor_status */
+           gss_const_OID,              /* mech */
+           gss_OID_set *,              /* mech_attrs */
+           gss_OID_set *               /* known_mech_attrs */
+       /* */);
+
 } *gss_mechanism;
 
 /* This structure MUST NOT be used by any code outside libgss */
 typedef struct gss_config_ext {
-    gss_acquire_cred_with_password_sfct        gss_acquire_cred_with_password;
+    gss_acquire_cred_with_password_sfct        gssspi_acquire_cred_with_password;
 } *gss_mechanism_ext;
 
 /*
@@ -687,18 +727,6 @@ gssint_userok(
        int *                   /* user_ok */
 );
 
-OM_uint32
-gss_store_cred(
-       OM_uint32 *,            /* minor_status */
-       const gss_cred_id_t,    /* input_cred_handle */
-       gss_cred_usage_t,       /* cred_usage */
-       const gss_OID,          /* desired_mech */
-       OM_uint32,              /* overwrite_cred */
-       OM_uint32,              /* default_cred */
-       gss_OID_set *,          /* elements_stored */
-       gss_cred_usage_t *      /* cred_usage_stored */
-);
-
 int
 gssint_get_der_length(
        unsigned char **,       /* buf */