diff options
| author | J. Bruce Fields <bfields@fieldses.org> | 2006-12-04 20:22:38 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-12-06 10:46:46 -0500 |
| commit | ca54f896454852f0bc8d50e6e4c55d9defedbd0a (patch) | |
| tree | f4d3c245f1b0e6edc38e4b9348d54f9f95028827 /net/sunrpc/auth_gss/gss_krb5_wrap.c | |
| parent | 2818bf81a8c91fb29634df68bdc3cc5e003201d0 (diff) | |
| download | kernel_samsung_smdk4412-ca54f896454852f0bc8d50e6e4c55d9defedbd0a.zip kernel_samsung_smdk4412-ca54f896454852f0bc8d50e6e4c55d9defedbd0a.tar.gz kernel_samsung_smdk4412-ca54f896454852f0bc8d50e6e4c55d9defedbd0a.tar.bz2 | |
rpcgss: simplify make_checksum
We're doing some pointless translation between krb5 constants and kernel
crypto string names.
Also clean up some related spkm3 code as necessary.
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'net/sunrpc/auth_gss/gss_krb5_wrap.c')
| -rw-r--r-- | net/sunrpc/auth_gss/gss_krb5_wrap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sunrpc/auth_gss/gss_krb5_wrap.c b/net/sunrpc/auth_gss/gss_krb5_wrap.c index 2069371..6d508d7 100644 --- a/net/sunrpc/auth_gss/gss_krb5_wrap.c +++ b/net/sunrpc/auth_gss/gss_krb5_wrap.c @@ -176,7 +176,7 @@ gss_wrap_kerberos(struct gss_ctx *ctx, int offset, /* XXXJBF: UGH!: */ tmp_pages = buf->pages; buf->pages = pages; - if (make_checksum(CKSUMTYPE_RSA_MD5, krb5_hdr, 8, buf, + if (make_checksum("md5", krb5_hdr, 8, buf, offset + headlen - blocksize, &md5cksum)) goto out_err; buf->pages = tmp_pages; @@ -272,7 +272,7 @@ gss_unwrap_kerberos(struct gss_ctx *ctx, int offset, struct xdr_buf *buf) ptr + 22 - (unsigned char *)buf->head[0].iov_base)) goto out; - ret = make_checksum(CKSUMTYPE_RSA_MD5, ptr - 2, 8, buf, + ret = make_checksum("md5", ptr - 2, 8, buf, ptr + 22 - (unsigned char *)buf->head[0].iov_base, &md5cksum); if (ret) goto out; |