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>
This commit is contained in:
committed by
Trond Myklebust
parent
14ae162c24
commit
00fd6e1425
@@ -116,7 +116,7 @@ make_confounder(char *p, int blocksize)
|
||||
/* XXX factor out common code with seal/unseal. */
|
||||
|
||||
u32
|
||||
gss_wrap_kerberos(struct gss_ctx *ctx, u32 qop, int offset,
|
||||
gss_wrap_kerberos(struct gss_ctx *ctx, int offset,
|
||||
struct xdr_buf *buf, struct page **pages)
|
||||
{
|
||||
struct krb5_ctx *kctx = ctx->internal_ctx_id;
|
||||
@@ -132,9 +132,6 @@ gss_wrap_kerberos(struct gss_ctx *ctx, u32 qop, int offset,
|
||||
|
||||
now = get_seconds();
|
||||
|
||||
if (qop != 0)
|
||||
goto out_err;
|
||||
|
||||
switch (kctx->signalg) {
|
||||
case SGN_ALG_DES_MAC_MD5:
|
||||
checksum_type = CKSUMTYPE_RSA_MD5;
|
||||
@@ -229,8 +226,7 @@ out_err:
|
||||
}
|
||||
|
||||
u32
|
||||
gss_unwrap_kerberos(struct gss_ctx *ctx, u32 *qop, int offset,
|
||||
struct xdr_buf *buf)
|
||||
gss_unwrap_kerberos(struct gss_ctx *ctx, int offset, struct xdr_buf *buf)
|
||||
{
|
||||
struct krb5_ctx *kctx = ctx->internal_ctx_id;
|
||||
int signalg;
|
||||
@@ -328,9 +324,6 @@ gss_unwrap_kerberos(struct gss_ctx *ctx, u32 *qop, int offset,
|
||||
|
||||
/* it got through unscathed. Make sure the context is unexpired */
|
||||
|
||||
if (qop)
|
||||
*qop = GSS_C_QOP_DEFAULT;
|
||||
|
||||
now = get_seconds();
|
||||
|
||||
ret = GSS_S_CONTEXT_EXPIRED;
|
||||
|
Reference in New Issue
Block a user