2015-06-16 19:58:07

by Fabian Frédérick

Subject: [PATCH 1/1 net-next] sunrpc: use sg_init_one() in krb5_rc4_setup_enc/seq_key()

Don't opencode sg_init_one()

Signed-off-by: Fabian Frederick <[email protected]>
---
net/sunrpc/auth_gss/gss_krb5_crypto.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/net/sunrpc/auth_gss/gss_krb5_crypto.c b/net/sunrpc/auth_gss/gss_krb5_crypto.c
index b5408e8..fee3c15 100644
--- a/net/sunrpc/auth_gss/gss_krb5_crypto.c
+++ b/net/sunrpc/auth_gss/gss_krb5_crypto.c
@@ -881,9 +881,7 @@ krb5_rc4_setup_seq_key(struct krb5_ctx *kctx, struct crypto_blkcipher *cipher,
if (err)
goto out_err;

- sg_init_table(sg, 1);
- sg_set_buf(sg, &zeroconstant, 4);
-
+ sg_init_one(sg, &zeroconstant, 4);
err = crypto_hash_digest(&desc, sg, 4, Kseq);
if (err)
goto out_err;
@@ -951,9 +949,7 @@ krb5_rc4_setup_enc_key(struct krb5_ctx *kctx, struct crypto_blkcipher *cipher,
if (err)
goto out_err;

- sg_init_table(sg, 1);
- sg_set_buf(sg, zeroconstant, 4);
-
+ sg_init_one(sg, zeroconstant, 4);
err = crypto_hash_digest(&desc, sg, 4, Kcrypt);
if (err)
goto out_err;
--
2.4.2

2015-06-19 19:52:53

by J. Bruce Fields

Subject: Re: [PATCH 1/1 net-next] sunrpc: use sg_init_one() in krb5_rc4_setup_enc/seq_key()

Thanks, applying.--b.

On Tue, Jun 16, 2015 at 09:57:52PM +0200, Fabian Frederick wrote:
> Don't opencode sg_init_one()
>
> Signed-off-by: Fabian Frederick <[email protected]>
> ---
> net/sunrpc/auth_gss/gss_krb5_crypto.c | 8 ++------
> 1 file changed, 2 insertions(+), 6 deletions(-)
>
> diff --git a/net/sunrpc/auth_gss/gss_krb5_crypto.c b/net/sunrpc/auth_gss/gss_krb5_crypto.c
> index b5408e8..fee3c15 100644
> --- a/net/sunrpc/auth_gss/gss_krb5_crypto.c
> +++ b/net/sunrpc/auth_gss/gss_krb5_crypto.c
> @@ -881,9 +881,7 @@ krb5_rc4_setup_seq_key(struct krb5_ctx *kctx, struct crypto_blkcipher *cipher,
> if (err)
> goto out_err;
>
> - sg_init_table(sg, 1);
> - sg_set_buf(sg, &zeroconstant, 4);
> -
> + sg_init_one(sg, &zeroconstant, 4);
> err = crypto_hash_digest(&desc, sg, 4, Kseq);
> if (err)
> goto out_err;
> @@ -951,9 +949,7 @@ krb5_rc4_setup_enc_key(struct krb5_ctx *kctx, struct crypto_blkcipher *cipher,
> if (err)
> goto out_err;
>
> - sg_init_table(sg, 1);
> - sg_set_buf(sg, zeroconstant, 4);
> -
> + sg_init_one(sg, zeroconstant, 4);
> err = crypto_hash_digest(&desc, sg, 4, Kcrypt);
> if (err)
> goto out_err;
> --
> 2.4.2