coelner/gnuk
1
0
Fork 0
mirror of https://salsa.debian.org/gnuk-team/gnuk/gnuk.git synced 2024-09-20 02:40:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use the variable name from RFC 7748.

Browse Source 
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2023-12-12 13:44:11 +09:00
parent db47ef5d26
commit ba1d8c29af
No known key found for this signature in database
GPG Key ID: 640114AF89DE6054
2 changed files with 37 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2023-12-12 NIIBE Yutaka <gniibe@fsij.org>
* src/ecc-x25519.c (mont_d_and_a): Use the variable name
from RFC 7748, so that reading the code can be easier.
2023-12-07 NIIBE Yutaka <gniibe@fsij.org> 2023-12-07 NIIBE Yutaka <gniibe@fsij.org>
* src/ecc.c (compute_kG): Do input validation on K. * src/ecc.c (compute_kG): Do input validation on K.

95
src/ecc-x25519.c
View File

@ -124,70 +124,39 @@ mont_d_and_a (fe *x0, fe *z0, fe *x1, fe *z1, const fe *dif_x, fe *t0, fe *t1)
#define zp z0 #define zp z0
#define xs x1 #define xs x1
#define zs z1 #define zs z1
#define C t0
#define D t1
#define A x1
#define B x0
#define CB t0
#define DA t1
#define AA z0
#define BB x1
#define CBpDA z1 /* CB + DA */
#define CBmDA t0 /* CB - DA */
#define E t1
#define CBmDAsq t0 /* (CB - DA)^2 */
#define a24E t0
#define a24EpAA z0 /* AA + a24E */
#define tmp0 t0 fe_add (C, x1, z1);
#define tmp1 t1 fe_sub (D, x1, z1);
#define tmp2 x1 fe_add (A, x0, z0);
#define tmp3 x0 fe_sub (B, x0, z0);
#define tmp4 t0 fe_mul (CB, B, C);
#define tmp5 t1 fe_mul (DA, A, D);
#define tmp6 z0 fe_sqr (AA, A);
#define tmp7 x1 fe_sqr (BB, B);
#define tmp8 z1 fe_add (CBpDA, CB, DA);
#define tmp9 t0 fe_sub (CBmDA, CB, DA);
#define tmpA t1 fe_mul (xp, AA, BB);
#define tmpB t0 fe_sub (E, AA, BB);
#define tmpC t0 fe_sqr (xs, CBpDA);
#define tmpD z0 fe_sqr (CBmDAsq, CBmDA);
fe_mul (zs, CBmDAsq, dif_x);
fe_add (tmp0, fe_m_d (a24E, E);
x1, fe_add (a24EpAA, AA, a24E);
z1); fe_mul (zp, a24EpAA, E);
fe_sub (tmp1,
x1,
z1);
fe_add (tmp2,
x0,
z0);
fe_sub (tmp3,
x0,
z0);
fe_mul (tmp4,
tmp3,
tmp0);
fe_mul (tmp5,
tmp2,
tmp1);
fe_sqr (tmp6,
tmp2);
fe_sqr (tmp7,
tmp3);
fe_add (tmp8,
tmp4,
tmp5);
fe_sub (tmp9,
tmp4,
tmp5);
fe_mul (xp,
tmp6,
tmp7);
fe_sub (tmpA,
tmp6,
tmp7);
fe_sqr (xs,
tmp8);
fe_sqr (tmpB,
tmp9);
fe_mul (zs,
tmpB, dif_x);
fe_m_d (tmpC,
tmpA);
fe_add (tmpD,
tmp6,
tmpC);
fe_mul (zp,
tmpD,
tmpA);
} }