gss_krb5: Use confounder length in wrap code

All encryption types use a confounder at the beginning of the
wrap token.  In all encryption types except arcfour-hmac, the
confounder is the same as the blocksize.  arcfour-hmac has a
blocksize of one, but uses an eight byte confounder.

Add an entry to the crypto framework definitions for the
confounder length and change the wrap/unwrap code to use
the confounder length rather than assuming it is always
the blocksize.

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, 4 insertions, 0 deletions

diff --git a/net/sunrpc/auth_gss/gss_krb5_mech.c b/net/sunrpc/auth_gss/gss_krb5_mech.c
index 893fad71e306..ef6b31349046 100644
--- a/net/sunrpc/auth_gss/gss_krb5_mech.c
+++ b/net/sunrpc/auth_gss/gss_krb5_mech.c
@@ -68,6 +68,7 @@ static const struct gss_krb5_enctype supported_gss_krb5_enctypes[] = {
           .keybytes = 7,
           .keylength = 8,
           .blocksize = 8,
+          .conflen = 8,
           .cksumlength = 8,
           .keyed_cksum = 0,
         },
@@ -88,6 +89,7 @@ static const struct gss_krb5_enctype supported_gss_krb5_enctypes[] = {
           .keybytes = 21,
           .keylength = 24,
           .blocksize = 8,
+          .conflen = 8,
           .cksumlength = 20,
           .keyed_cksum = 1,
         },
@@ -110,6 +112,7 @@ static const struct gss_krb5_enctype supported_gss_krb5_enctypes[] = {
           .keybytes = 16,
           .keylength = 16,
           .blocksize = 16,
+          .conflen = 16,
           .cksumlength = 12,
           .keyed_cksum = 1,
         },
@@ -132,6 +135,7 @@ static const struct gss_krb5_enctype supported_gss_krb5_enctypes[] = {
           .keybytes = 32,
           .keylength = 32,
           .blocksize = 16,
+          .conflen = 16,
           .cksumlength = 12,
           .keyed_cksum = 1,
         },