1 files changed, 25 insertions, 7 deletions

diff --git a/include/linux/sunrpc/gss_api.h b/include/linux/sunrpc/gss_api.h
index a19e2547ae6a..161463e59624 100644
--- a/include/linux/sunrpc/gss_api.h
+++ b/include/linux/sunrpc/gss_api.h
@@ -25,10 +25,21 @@ struct gss_ctx {
 
 #define GSS_C_NO_BUFFER         ((struct xdr_netobj) 0)
 #define GSS_C_NO_CONTEXT        ((struct gss_ctx *) 0)
-#define GSS_C_NULL_OID          ((struct xdr_netobj) 0)
+#define GSS_C_QOP_DEFAULT       (0)
 
 /*XXX  arbitrary length - is this set somewhere? */
 #define GSS_OID_MAX_LEN 32
+struct rpcsec_gss_oid {
+        unsigned int    len;
+        u8              data[GSS_OID_MAX_LEN];
+};
+
+/* From RFC 3530 */
+struct rpcsec_gss_info {
+        struct rpcsec_gss_oid   oid;
+        u32                     qop;
+        u32                     service;
+};
 
 /* gss-api prototypes; note that these are somewhat simplified versions of
  * the prototypes specified in RFC 2744. */
@@ -37,6 +48,7 @@ int gss_import_sec_context(
                 size_t                  bufsize,
                 struct gss_api_mech     *mech,
                 struct gss_ctx          **ctx_id,
+                time_t                  *endtime,
                 gfp_t                   gfp_mask);
 u32 gss_get_mic(
                 struct gss_ctx          *ctx_id,
@@ -58,12 +70,14 @@ u32 gss_unwrap(
 u32 gss_delete_sec_context(
                 struct gss_ctx          **ctx_id);
 
-u32 gss_svc_to_pseudoflavor(struct gss_api_mech *, u32 service);
+rpc_authflavor_t gss_svc_to_pseudoflavor(struct gss_api_mech *, u32 qop,
+                                        u32 service);
 u32 gss_pseudoflavor_to_service(struct gss_api_mech *, u32 pseudoflavor);
 char *gss_service_to_auth_domain_name(struct gss_api_mech *, u32 service);
 
 struct pf_desc {
         u32     pseudoflavor;
+        u32     qop;
         u32     service;
         char    *name;
         char    *auth_domain_name;
@@ -76,7 +90,7 @@ struct pf_desc {
 struct gss_api_mech {
         struct list_head        gm_list;
         struct module           *gm_owner;
-        struct xdr_netobj       gm_oid;
+        struct rpcsec_gss_oid   gm_oid;
         char                    *gm_name;
         const struct gss_api_ops *gm_ops;
         /* pseudoflavors supported by this mechanism: */
@@ -92,6 +106,7 @@ struct gss_api_ops {
                         const void              *input_token,
                         size_t                  bufsize,
                         struct gss_ctx          *ctx_id,
+                        time_t                  *endtime,
                         gfp_t                   gfp_mask);
         u32 (*gss_get_mic)(
                         struct gss_ctx          *ctx_id,
@@ -119,7 +134,13 @@ void gss_mech_unregister(struct gss_api_mech *);
 
 /* returns a mechanism descriptor given an OID, and increments the mechanism's
  * reference count. */
-struct gss_api_mech * gss_mech_get_by_OID(struct xdr_netobj *);
+struct gss_api_mech * gss_mech_get_by_OID(struct rpcsec_gss_oid *);
+
+/* Given a GSS security tuple, look up a pseudoflavor */
+rpc_authflavor_t gss_mech_info2flavor(struct rpcsec_gss_info *);
+
+/* Given a pseudoflavor, look up a GSS security tuple */
+int gss_mech_flavor2info(rpc_authflavor_t, struct rpcsec_gss_info *);
 
 /* Returns a reference to a mechanism, given a name like "krb5" etc. */
 struct gss_api_mech *gss_mech_get_by_name(const char *);
@@ -130,9 +151,6 @@ struct gss_api_mech *gss_mech_get_by_pseudoflavor(u32);
 /* Fill in an array with a list of supported pseudoflavors */
 int gss_mech_list_pseudoflavors(rpc_authflavor_t *, int);
 
-/* Just increments the mechanism's reference count and returns its input: */
-struct gss_api_mech * gss_mech_get(struct gss_api_mech *);
-
 /* For every successful gss_mech_get or gss_mech_get_by_* call there must be a
  * corresponding call to gss_mech_put. */
 void gss_mech_put(struct gss_api_mech *);