3 files changed, 8 insertions, 8 deletions

diff --git a/net/sunrpc/auth_gss/gss_spkm3_seal.c b/net/sunrpc/auth_gss/gss_spkm3_seal.c
index d1e12b25d6e2..86fbf7c3e39c 100644
--- a/net/sunrpc/auth_gss/gss_spkm3_seal.c
+++ b/net/sunrpc/auth_gss/gss_spkm3_seal.c
@@ -59,7 +59,7 @@ spkm3_make_token(struct spkm3_ctx *ctx,
         char                    tokhdrbuf[25];
         struct xdr_netobj       md5cksum = {.len = 0, .data = NULL};
         struct xdr_netobj       mic_hdr = {.len = 0, .data = tokhdrbuf};
-        int                     tmsglen, tokenlen = 0;
+        int                     tokenlen = 0;
         unsigned char           *ptr;
         s32                     now;
         int                     ctxelen = 0, ctxzbit = 0;
@@ -92,24 +92,23 @@ spkm3_make_token(struct spkm3_ctx *ctx,
         }
 
         if (toktype == SPKM_MIC_TOK) {
-                tmsglen = 0;
                 /* Calculate checksum over the mic-header */
                 asn1_bitstring_len(&ctx->ctx_id, &ctxelen, &ctxzbit);
                 spkm3_mic_header(&mic_hdr.data, &mic_hdr.len, ctx->ctx_id.data,
                                          ctxelen, ctxzbit);
 
                 if (make_checksum(checksum_type, mic_hdr.data, mic_hdr.len, 
-                                             text, &md5cksum))
+                                             text, 0, &md5cksum))
                         goto out_err;
 
                 asn1_bitstring_len(&md5cksum, &md5elen, &md5zbit);
-                tokenlen = 10 + ctxelen + 1 + 2 + md5elen + 1;
+                tokenlen = 10 + ctxelen + 1 + md5elen + 1;
 
                 /* Create token header using generic routines */
-                token->len = g_token_size(&ctx->mech_used, tokenlen + tmsglen);
+                token->len = g_token_size(&ctx->mech_used, tokenlen);
 
                 ptr = token->data;
-                g_make_token_header(&ctx->mech_used, tokenlen + tmsglen, &ptr);
+                g_make_token_header(&ctx->mech_used, tokenlen, &ptr);
 
                 spkm3_make_mic_token(&ptr, tokenlen, &mic_hdr, &md5cksum, md5elen, md5zbit);
         } else if (toktype == SPKM_WRAP_TOK) { /* Not Supported */
diff --git a/net/sunrpc/auth_gss/gss_spkm3_token.c b/net/sunrpc/auth_gss/gss_spkm3_token.c
index 1f824578d773..af0d7ce74686 100644
--- a/net/sunrpc/auth_gss/gss_spkm3_token.c
+++ b/net/sunrpc/auth_gss/gss_spkm3_token.c
@@ -182,6 +182,7 @@ spkm3_mic_header(unsigned char **hdrbuf, unsigned int *hdrlen, unsigned char *ct
  * *tokp points to the beginning of the SPKM_MIC token  described 
  * in rfc 2025, section 3.2.1: 
  *
+ * toklen is the inner token length
  */
 void
 spkm3_make_mic_token(unsigned char **tokp, int toklen, struct xdr_netobj *mic_hdr, struct xdr_netobj *md5cksum, int md5elen, int md5zbit)
@@ -189,7 +190,7 @@ spkm3_make_mic_token(unsigned char **tokp, int toklen, struct xdr_netobj *mic_hd
         unsigned char *ict = *tokp;
 
         *(u8 *)ict++ = 0xa4;
-        *(u8 *)ict++ = toklen - 2; 
+        *(u8 *)ict++ = toklen;
         memcpy(ict, mic_hdr->data, mic_hdr->len);
         ict += mic_hdr->len;
 
diff --git a/net/sunrpc/auth_gss/gss_spkm3_unseal.c b/net/sunrpc/auth_gss/gss_spkm3_unseal.c
index 241d5b30dfcb..96851b0ba1ba 100644
--- a/net/sunrpc/auth_gss/gss_spkm3_unseal.c
+++ b/net/sunrpc/auth_gss/gss_spkm3_unseal.c
@@ -95,7 +95,7 @@ spkm3_read_token(struct spkm3_ctx *ctx,
                 ret = GSS_S_DEFECTIVE_TOKEN;
                 code = make_checksum(CKSUMTYPE_RSA_MD5, ptr + 2, 
                                         mic_hdrlen + 2, 
-                                        message_buffer, &md5cksum);
+                                        message_buffer, 0, &md5cksum);
 
                 if (code)
                         goto out;