Messages in this thread Patch in this message | | | From | cgel.zte@gmail ... | Subject | [PATCH] lib/mpi: use swap() to make code cleaner | Date | Thu, 18 Nov 2021 06:16:21 +0000 |
| |
From: Yao Jing <yao.jing2@zte.com.cn>
Use the macro 'swap()' defined in 'include/linux/minmax.h' to avoid opencoding it.
Reported-by: Zeal Robot <zealci@zte.com.cn> Signed-off-by: Yao Jing <yao.jing2@zte.com.cn> --- lib/mpi/ec.c | 6 ++---- lib/mpi/mpi-pow.c | 9 ++------- 2 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/lib/mpi/ec.c b/lib/mpi/ec.c index 40f5908e57a4..a2f5694425ee 100644 --- a/lib/mpi/ec.c +++ b/lib/mpi/ec.c @@ -1282,14 +1282,12 @@ void mpi_ec_mul_point(MPI_POINT result, sum = &p2_; for (j = nbits-1; j >= 0; j--) { - MPI_POINT t; - sw = mpi_test_bit(scalar, j); point_swap_cond(q1, q2, sw, ctx); montgomery_ladder(prd, sum, q1, q2, point->x, ctx); point_swap_cond(prd, sum, sw, ctx); - t = q1; q1 = prd; prd = t; - t = q2; q2 = sum; sum = t; + swap(q1, prd); + swap(q2, sum); } mpi_clear(result->y); diff --git a/lib/mpi/mpi-pow.c b/lib/mpi/mpi-pow.c index 2fd7a46d55ec..67fbd4c2503d 100644 --- a/lib/mpi/mpi-pow.c +++ b/lib/mpi/mpi-pow.c @@ -176,7 +176,6 @@ int mpi_powm(MPI res, MPI base, MPI exp, MPI mod) for (;;) { while (c) { - mpi_ptr_t tp; mpi_size_t xsize; /*if (mpihelp_mul_n(xp, rp, rp, rsize) < 0) goto enomem */ @@ -207,9 +206,7 @@ int mpi_powm(MPI res, MPI base, MPI exp, MPI mod) xsize = msize; } - tp = rp; - rp = xp; - xp = tp; + swap(rp, xp); rsize = xsize; if ((mpi_limb_signed_t) e < 0) { @@ -235,9 +232,7 @@ int mpi_powm(MPI res, MPI base, MPI exp, MPI mod) xsize = msize; } - tp = rp; - rp = xp; - xp = tp; + swap(rp, xp); rsize = xsize; } e <<= 1; -- 2.25.1
| |