gssd_krb5: arcfour-hmac support

For arcfour-hmac support, the make_checksum function needs a usage
field to correctly calculate the checksum differently for MIC and
WRAP tokens.

Signed-off-by: Kevin Coffman <kwc@citi.umich.edu>
Signed-off-by: Steve Dickson <steved@redhat.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

1 files changed, 9 insertions, 4 deletions

diff --git a/net/sunrpc/auth_gss/gss_krb5_seal.c b/net/sunrpc/auth_gss/gss_krb5_seal.c
index 477a546d19bb..e22fed3d9a1b 100644
--- a/net/sunrpc/auth_gss/gss_krb5_seal.c
+++ b/net/sunrpc/auth_gss/gss_krb5_seal.c
@@ -142,7 +142,8 @@ gss_get_mic_v1(struct krb5_ctx *ctx, struct xdr_buf *text,
         else
                 cksumkey = NULL;
 
-        if (make_checksum(ctx, ptr, 8, text, 0, cksumkey, &md5cksum))
+        if (make_checksum(ctx, ptr, 8, text, 0, cksumkey,
+                          KG_USAGE_SIGN, &md5cksum))
                 return GSS_S_FAILURE;
 
         memcpy(ptr + GSS_KRB5_TOK_HDR_LEN, md5cksum.data, md5cksum.len);
@@ -170,6 +171,7 @@ gss_get_mic_v2(struct krb5_ctx *ctx, struct xdr_buf *text,
         s32 now;
         u64 seq_send;
         u8 *cksumkey;
+        unsigned int cksum_usage;
 
         dprintk("RPC:       %s\n", __func__);
 
@@ -182,13 +184,16 @@ gss_get_mic_v2(struct krb5_ctx *ctx, struct xdr_buf *text,
         spin_unlock(&krb5_seq_lock);
         *((u64 *)(krb5_hdr + 8)) = cpu_to_be64(seq_send);
 
-        if (ctx->initiate)
+        if (ctx->initiate) {
                 cksumkey = ctx->initiator_sign;
-        else
+                cksum_usage = KG_USAGE_INITIATOR_SIGN;
+        } else {
                 cksumkey = ctx->acceptor_sign;
+                cksum_usage = KG_USAGE_ACCEPTOR_SIGN;
+        }
 
         if (make_checksum_v2(ctx, krb5_hdr, GSS_KRB5_TOK_HDR_LEN,
-                             text, 0, cksumkey, &cksumobj))
+                             text, 0, cksumkey, cksum_usage, &cksumobj))
                 return GSS_S_FAILURE;
 
         memcpy(krb5_hdr + GSS_KRB5_TOK_HDR_LEN, cksumobj.data, cksumobj.len);