Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1350e647 authored by Herbert Xu's avatar Herbert Xu Committed by Greg Kroah-Hartman
Browse files

UPSTREAM: crypto: x86/curve25519 - Remove unused carry variables 



The carry variables are assigned but never used, which upsets
the compiler.  This patch removes them.

Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Reviewed-by: default avatarKarthikeyan Bhargavan <karthik.bhargavan@gmail.com>
Acked-by: default avatarJason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
(cherry picked from commit 054a5540fb8f7268e2c79e9deab4242db15c8cba)
Bug: 152722841
Signed-off-by: default avatarJason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: Ia581bdb636cdc24fe0b3d6cb9f95557221405ee7
parent 695a313d

arch/x86/crypto/curve25519-x86_64.c

+2 −4
Original line number Diff line number Diff line
@@ -948,10 +948,8 @@ static void store_felem(u64 *b, u64 *f) 
{

	u64 f30 = f[3U];

	u64 top_bit0 = f30 >> (u32)63U;

	u64 carry0;

	u64 f31;

	u64 top_bit;

	u64 carry;

	u64 f0;

	u64 f1;

	u64 f2;
@@ -970,11 +968,11 @@ static void store_felem(u64 *b, u64 *f) 
	u64 o2;

	u64 o3;

	f[3U] = f30 & (u64)0x7fffffffffffffffU;

	carry0 = add_scalar(f, f, (u64)19U * top_bit0);

	add_scalar(f, f, (u64)19U * top_bit0);

	f31 = f[3U];

	top_bit = f31 >> (u32)63U;

	f[3U] = f31 & (u64)0x7fffffffffffffffU;

	carry = add_scalar(f, f, (u64)19U * top_bit);

	add_scalar(f, f, (u64)19U * top_bit);

	f0 = f[0U];

	f1 = f[1U];

	f2 = f[2U];