openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
J. Bruce Fields 2006-12-04 20:22:38 -05:00 committed by Trond Myklebust
parent 2818bf81a8
commit ca54f89645
5 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/sunrpc/gss_krb5.h
View File

@ -116,7 +116,7 @@ enum seal_alg {
#define ENCTYPE_UNKNOWN 0x01ff #define ENCTYPE_UNKNOWN 0x01ff
s32 s32
make_checksum(s32 cksumtype, char *header, int hdrlen, struct xdr_buf *body, make_checksum(char *, char *header, int hdrlen, struct xdr_buf *body,
int body_offset, struct xdr_netobj *cksum); int body_offset, struct xdr_netobj *cksum);
u32 gss_get_mic_kerberos(struct gss_ctx *, struct xdr_buf *, u32 gss_get_mic_kerberos(struct gss_ctx *, struct xdr_buf *,

12
net/sunrpc/auth_gss/gss_krb5_crypto.c
View File

@ -130,23 +130,13 @@ checksummer(struct scatterlist *sg, void *data)
/* checksum the plaintext data and hdrlen bytes of the token header */ /* checksum the plaintext data and hdrlen bytes of the token header */
s32 s32
make_checksum(s32 cksumtype, char *header, int hdrlen, struct xdr_buf *body, make_checksum(char *cksumname, char *header, int hdrlen, struct xdr_buf *body,
int body_offset, struct xdr_netobj *cksum) int body_offset, struct xdr_netobj *cksum)
{ {
char *cksumname;
struct hash_desc desc; /* XXX add to ctx? */ struct hash_desc desc; /* XXX add to ctx? */
struct scatterlist sg[1]; struct scatterlist sg[1];
int err; int err;
switch (cksumtype) {
case CKSUMTYPE_RSA_MD5:
cksumname = "md5";
break;
default:
dprintk("RPC: krb5_make_checksum:"
" unsupported checksum %d", cksumtype);
return GSS_S_FAILURE;
}
desc.tfm = crypto_alloc_hash(cksumname, 0, CRYPTO_ALG_ASYNC); desc.tfm = crypto_alloc_hash(cksumname, 0, CRYPTO_ALG_ASYNC);
if (IS_ERR(desc.tfm)) if (IS_ERR(desc.tfm))
return GSS_S_FAILURE; return GSS_S_FAILURE;

2
net/sunrpc/auth_gss/gss_krb5_seal.c
View File

@ -108,7 +108,7 @@ gss_get_mic_kerberos(struct gss_ctx *gss_ctx, struct xdr_buf *text,
*(__be16 *)(krb5_hdr + 2) = htons(SGN_ALG_DES_MAC_MD5); *(__be16 *)(krb5_hdr + 2) = htons(SGN_ALG_DES_MAC_MD5);
memset(krb5_hdr + 4, 0xff, 4); memset(krb5_hdr + 4, 0xff, 4);
if (make_checksum(CKSUMTYPE_RSA_MD5, krb5_hdr, 8, text, 0, &md5cksum)) if (make_checksum("md5", krb5_hdr, 8, text, 0, &md5cksum))
goto out_err; goto out_err;
if (krb5_encrypt(ctx->seq, NULL, md5cksum.data, if (krb5_encrypt(ctx->seq, NULL, md5cksum.data,

3
net/sunrpc/auth_gss/gss_krb5_unseal.c
View File

@ -114,8 +114,7 @@ gss_verify_mic_kerberos(struct gss_ctx *gss_ctx,
if (signalg != SGN_ALG_DES_MAC_MD5) if (signalg != SGN_ALG_DES_MAC_MD5)
goto out; goto out;
ret = make_checksum(CKSUMTYPE_RSA_MD5, ptr - 2, 8, ret = make_checksum("md5", ptr - 2, 8, message_buffer, 0, &md5cksum);
message_buffer, 0, &md5cksum);
if (ret) if (ret)
goto out; goto out;

4
net/sunrpc/auth_gss/gss_krb5_wrap.c
View File

@ -176,7 +176,7 @@ gss_wrap_kerberos(struct gss_ctx *ctx, int offset,
/* XXXJBF: UGH!: */ /* XXXJBF: UGH!: */
tmp_pages = buf->pages; tmp_pages = buf->pages;
buf->pages = 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)) offset + headlen - blocksize, &md5cksum))
goto out_err; goto out_err;
buf->pages = tmp_pages; 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)) ptr + 22 - (unsigned char *)buf->head[0].iov_base))
goto out; 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); ptr + 22 - (unsigned char *)buf->head[0].iov_base, &md5cksum);
if (ret) if (ret)
goto out; goto out;