RPCSEC_GSS: krb5 pre-privacy cleanup
The code this was originally derived from processed wrap and mic tokens using the same functions. This required some contortions, and more would be required with the addition of xdr_buf's, so it's better to separate out the two code paths. In preparation for adding privacy support, remove the last vestiges of the old wrap token code. 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
f7b3af64c6
commit
bfa91516b5
@@ -199,8 +199,7 @@ gss_verify_mic_kerberos(struct gss_ctx *ctx,
|
||||
int qop_state;
|
||||
struct krb5_ctx *kctx = ctx->internal_ctx_id;
|
||||
|
||||
maj_stat = krb5_read_token(kctx, mic_token, message, &qop_state,
|
||||
KG_TOK_MIC_MSG);
|
||||
maj_stat = krb5_read_token(kctx, mic_token, message, &qop_state);
|
||||
if (!maj_stat && qop_state)
|
||||
*qstate = qop_state;
|
||||
|
||||
@@ -216,7 +215,7 @@ gss_get_mic_kerberos(struct gss_ctx *ctx,
|
||||
u32 err = 0;
|
||||
struct krb5_ctx *kctx = ctx->internal_ctx_id;
|
||||
|
||||
err = krb5_make_token(kctx, qop, message, mic_token, KG_TOK_MIC_MSG);
|
||||
err = krb5_make_token(kctx, qop, message, mic_token);
|
||||
|
||||
dprintk("RPC: gss_get_mic_kerberos returning %d\n",err);
|
||||
|
||||
|
Reference in New Issue
Block a user