diff options
author | J. Bruce Fields <bfields@fieldses.org> | 2005-10-13 16:55:18 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2005-10-19 02:19:47 -0400 |
commit | 00fd6e14255fe7a249315746386d640bc4e9e758 (patch) | |
tree | 36d8fad57404c5ea96cdb6e5579f4241e2cd8188 /include/linux/sunrpc/gss_api.h | |
parent | 14ae162c24d985593d5b19437d7f3d8fd0062b59 (diff) |
RPCSEC_GSS remove all qop parameters
Not only are the qop parameters that are passed around throughout the gssapi
unused by any currently implemented mechanism, but there appears to be some
doubt as to whether they will ever be used. Let's just kill them off for now.
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'include/linux/sunrpc/gss_api.h')
-rw-r--r-- | include/linux/sunrpc/gss_api.h | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/include/linux/sunrpc/gss_api.h b/include/linux/sunrpc/gss_api.h index e896752ffbf9..9b8bcf125c18 100644 --- a/include/linux/sunrpc/gss_api.h +++ b/include/linux/sunrpc/gss_api.h | |||
@@ -40,23 +40,19 @@ int gss_import_sec_context( | |||
40 | struct gss_ctx **ctx_id); | 40 | struct gss_ctx **ctx_id); |
41 | u32 gss_get_mic( | 41 | u32 gss_get_mic( |
42 | struct gss_ctx *ctx_id, | 42 | struct gss_ctx *ctx_id, |
43 | u32 qop, | ||
44 | struct xdr_buf *message, | 43 | struct xdr_buf *message, |
45 | struct xdr_netobj *mic_token); | 44 | struct xdr_netobj *mic_token); |
46 | u32 gss_verify_mic( | 45 | u32 gss_verify_mic( |
47 | struct gss_ctx *ctx_id, | 46 | struct gss_ctx *ctx_id, |
48 | struct xdr_buf *message, | 47 | struct xdr_buf *message, |
49 | struct xdr_netobj *mic_token, | 48 | struct xdr_netobj *mic_token); |
50 | u32 *qstate); | ||
51 | u32 gss_wrap( | 49 | u32 gss_wrap( |
52 | struct gss_ctx *ctx_id, | 50 | struct gss_ctx *ctx_id, |
53 | u32 qop, | ||
54 | int offset, | 51 | int offset, |
55 | struct xdr_buf *outbuf, | 52 | struct xdr_buf *outbuf, |
56 | struct page **inpages); | 53 | struct page **inpages); |
57 | u32 gss_unwrap( | 54 | u32 gss_unwrap( |
58 | struct gss_ctx *ctx_id, | 55 | struct gss_ctx *ctx_id, |
59 | u32 *qop, | ||
60 | int offset, | 56 | int offset, |
61 | struct xdr_buf *inbuf); | 57 | struct xdr_buf *inbuf); |
62 | u32 gss_delete_sec_context( | 58 | u32 gss_delete_sec_context( |
@@ -67,7 +63,6 @@ char *gss_service_to_auth_domain_name(struct gss_api_mech *, u32 service); | |||
67 | 63 | ||
68 | struct pf_desc { | 64 | struct pf_desc { |
69 | u32 pseudoflavor; | 65 | u32 pseudoflavor; |
70 | u32 qop; | ||
71 | u32 service; | 66 | u32 service; |
72 | char *name; | 67 | char *name; |
73 | char *auth_domain_name; | 68 | char *auth_domain_name; |
@@ -96,23 +91,19 @@ struct gss_api_ops { | |||
96 | struct gss_ctx *ctx_id); | 91 | struct gss_ctx *ctx_id); |
97 | u32 (*gss_get_mic)( | 92 | u32 (*gss_get_mic)( |
98 | struct gss_ctx *ctx_id, | 93 | struct gss_ctx *ctx_id, |
99 | u32 qop, | ||
100 | struct xdr_buf *message, | 94 | struct xdr_buf *message, |
101 | struct xdr_netobj *mic_token); | 95 | struct xdr_netobj *mic_token); |
102 | u32 (*gss_verify_mic)( | 96 | u32 (*gss_verify_mic)( |
103 | struct gss_ctx *ctx_id, | 97 | struct gss_ctx *ctx_id, |
104 | struct xdr_buf *message, | 98 | struct xdr_buf *message, |
105 | struct xdr_netobj *mic_token, | 99 | struct xdr_netobj *mic_token); |
106 | u32 *qstate); | ||
107 | u32 (*gss_wrap)( | 100 | u32 (*gss_wrap)( |
108 | struct gss_ctx *ctx_id, | 101 | struct gss_ctx *ctx_id, |
109 | u32 qop, | ||
110 | int offset, | 102 | int offset, |
111 | struct xdr_buf *outbuf, | 103 | struct xdr_buf *outbuf, |
112 | struct page **inpages); | 104 | struct page **inpages); |
113 | u32 (*gss_unwrap)( | 105 | u32 (*gss_unwrap)( |
114 | struct gss_ctx *ctx_id, | 106 | struct gss_ctx *ctx_id, |
115 | u32 *qop, | ||
116 | int offset, | 107 | int offset, |
117 | struct xdr_buf *buf); | 108 | struct xdr_buf *buf); |
118 | void (*gss_delete_sec_context)( | 109 | void (*gss_delete_sec_context)( |