sunrpc: remove "ec" argument from encrypt_v2 operation
It's always 0. Signed-off-by: Jeff Layton <jlayton@primarydata.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>hifive-unleashed-5.1
parent
b36e9c44af
commit
ec25422c66
|
@ -81,7 +81,7 @@ struct gss_krb5_enctype {
|
||||||
struct xdr_netobj *in,
|
struct xdr_netobj *in,
|
||||||
struct xdr_netobj *out); /* complete key generation */
|
struct xdr_netobj *out); /* complete key generation */
|
||||||
u32 (*encrypt_v2) (struct krb5_ctx *kctx, u32 offset,
|
u32 (*encrypt_v2) (struct krb5_ctx *kctx, u32 offset,
|
||||||
struct xdr_buf *buf, int ec,
|
struct xdr_buf *buf,
|
||||||
struct page **pages); /* v2 encryption function */
|
struct page **pages); /* v2 encryption function */
|
||||||
u32 (*decrypt_v2) (struct krb5_ctx *kctx, u32 offset,
|
u32 (*decrypt_v2) (struct krb5_ctx *kctx, u32 offset,
|
||||||
struct xdr_buf *buf, u32 *headskip,
|
struct xdr_buf *buf, u32 *headskip,
|
||||||
|
@ -310,7 +310,7 @@ gss_krb5_aes_make_key(const struct gss_krb5_enctype *gk5e,
|
||||||
|
|
||||||
u32
|
u32
|
||||||
gss_krb5_aes_encrypt(struct krb5_ctx *kctx, u32 offset,
|
gss_krb5_aes_encrypt(struct krb5_ctx *kctx, u32 offset,
|
||||||
struct xdr_buf *buf, int ec,
|
struct xdr_buf *buf,
|
||||||
struct page **pages);
|
struct page **pages);
|
||||||
|
|
||||||
u32
|
u32
|
||||||
|
|
|
@ -641,7 +641,7 @@ out:
|
||||||
|
|
||||||
u32
|
u32
|
||||||
gss_krb5_aes_encrypt(struct krb5_ctx *kctx, u32 offset,
|
gss_krb5_aes_encrypt(struct krb5_ctx *kctx, u32 offset,
|
||||||
struct xdr_buf *buf, int ec, struct page **pages)
|
struct xdr_buf *buf, struct page **pages)
|
||||||
{
|
{
|
||||||
u32 err;
|
u32 err;
|
||||||
struct xdr_netobj hmac;
|
struct xdr_netobj hmac;
|
||||||
|
@ -684,13 +684,8 @@ gss_krb5_aes_encrypt(struct krb5_ctx *kctx, u32 offset,
|
||||||
ecptr = buf->tail[0].iov_base;
|
ecptr = buf->tail[0].iov_base;
|
||||||
}
|
}
|
||||||
|
|
||||||
memset(ecptr, 'X', ec);
|
|
||||||
buf->tail[0].iov_len += ec;
|
|
||||||
buf->len += ec;
|
|
||||||
|
|
||||||
/* copy plaintext gss token header after filler (if any) */
|
/* copy plaintext gss token header after filler (if any) */
|
||||||
memcpy(ecptr + ec, buf->head[0].iov_base + offset,
|
memcpy(ecptr, buf->head[0].iov_base + offset, GSS_KRB5_TOK_HDR_LEN);
|
||||||
GSS_KRB5_TOK_HDR_LEN);
|
|
||||||
buf->tail[0].iov_len += GSS_KRB5_TOK_HDR_LEN;
|
buf->tail[0].iov_len += GSS_KRB5_TOK_HDR_LEN;
|
||||||
buf->len += GSS_KRB5_TOK_HDR_LEN;
|
buf->len += GSS_KRB5_TOK_HDR_LEN;
|
||||||
|
|
||||||
|
|
|
@ -483,7 +483,7 @@ gss_wrap_kerberos_v2(struct krb5_ctx *kctx, u32 offset,
|
||||||
*be64ptr = cpu_to_be64(kctx->seq_send64++);
|
*be64ptr = cpu_to_be64(kctx->seq_send64++);
|
||||||
spin_unlock(&krb5_seq_lock);
|
spin_unlock(&krb5_seq_lock);
|
||||||
|
|
||||||
err = (*kctx->gk5e->encrypt_v2)(kctx, offset, buf, 0, pages);
|
err = (*kctx->gk5e->encrypt_v2)(kctx, offset, buf, pages);
|
||||||
if (err)
|
if (err)
|
||||||
return err;
|
return err;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue