aboutsummaryrefslogtreecommitdiffstats
path: root/net/sunrpc/auth_gss/gss_krb5_unseal.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/sunrpc/auth_gss/gss_krb5_unseal.c')
-rw-r--r--net/sunrpc/auth_gss/gss_krb5_unseal.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/net/sunrpc/auth_gss/gss_krb5_unseal.c b/net/sunrpc/auth_gss/gss_krb5_unseal.c
index 4ede4cc4391..ef91366e3de 100644
--- a/net/sunrpc/auth_gss/gss_krb5_unseal.c
+++ b/net/sunrpc/auth_gss/gss_krb5_unseal.c
@@ -115,7 +115,7 @@ gss_verify_mic_v1(struct krb5_ctx *ctx,
115 cksumkey = NULL; 115 cksumkey = NULL;
116 116
117 if (make_checksum(ctx, ptr, 8, message_buffer, 0, 117 if (make_checksum(ctx, ptr, 8, message_buffer, 0,
118 cksumkey, &md5cksum)) 118 cksumkey, KG_USAGE_SIGN, &md5cksum))
119 return GSS_S_FAILURE; 119 return GSS_S_FAILURE;
120 120
121 if (memcmp(md5cksum.data, ptr + GSS_KRB5_TOK_HDR_LEN, 121 if (memcmp(md5cksum.data, ptr + GSS_KRB5_TOK_HDR_LEN,
@@ -154,6 +154,7 @@ gss_verify_mic_v2(struct krb5_ctx *ctx,
154 u8 *cksumkey; 154 u8 *cksumkey;
155 u8 flags; 155 u8 flags;
156 int i; 156 int i;
157 unsigned int cksum_usage;
157 158
158 dprintk("RPC: %s\n", __func__); 159 dprintk("RPC: %s\n", __func__);
159 160
@@ -174,13 +175,16 @@ gss_verify_mic_v2(struct krb5_ctx *ctx,
174 if (ptr[i] != 0xff) 175 if (ptr[i] != 0xff)
175 return GSS_S_DEFECTIVE_TOKEN; 176 return GSS_S_DEFECTIVE_TOKEN;
176 177
177 if (ctx->initiate) 178 if (ctx->initiate) {
178 cksumkey = ctx->acceptor_sign; 179 cksumkey = ctx->acceptor_sign;
179 else 180 cksum_usage = KG_USAGE_ACCEPTOR_SIGN;
181 } else {
180 cksumkey = ctx->initiator_sign; 182 cksumkey = ctx->initiator_sign;
183 cksum_usage = KG_USAGE_INITIATOR_SIGN;
184 }
181 185
182 if (make_checksum_v2(ctx, ptr, GSS_KRB5_TOK_HDR_LEN, message_buffer, 0, 186 if (make_checksum_v2(ctx, ptr, GSS_KRB5_TOK_HDR_LEN, message_buffer, 0,
183 cksumkey, &cksumobj)) 187 cksumkey, cksum_usage, &cksumobj))
184 return GSS_S_FAILURE; 188 return GSS_S_FAILURE;
185 189
186 if (memcmp(cksumobj.data, ptr + GSS_KRB5_TOK_HDR_LEN, 190 if (memcmp(cksumobj.data, ptr + GSS_KRB5_TOK_HDR_LEN,