git: plan9front

Info  •  Files  •  Log  •  Branches

libsec: rename internal fmul() function form curve25519.c to not conflict unix <math.h> (thanks  an2qzavok)

To keep stuff in sync with drawterm, avoid prototype conflict
with fmul() and rename to fmult().

--- a/sys/src/libsec/port/curve25519.c

+++ b/sys/src/libsec/port/curve25519.c

@@ -225,7 +225,7 @@

  * reduced coefficient.

  */

 static void

-fmul(felem *output, felem *in, felem *in2) {

+fmult(felem *output, felem *in, felem *in2) {

   felem t[19];

   fproduct(t, in, in2);

   freduce_degree(t);

@@ -509,10 +509,10 @@

   /* 2 */ fsquare(z2,z);

   /* 4 */ fsquare(t1,z2);

   /* 8 */ fsquare(t0,t1);

-  /* 9 */ fmul(z9,t0,z);

-  /* 11 */ fmul(z11,z9,z2);

+  /* 9 */ fmult(z9,t0,z);

+  /* 11 */ fmult(z11,z9,z2);

   /* 22 */ fsquare(t0,z11);

-  /* 2^5 - 2^0 = 31 */ fmul(z2_5_0,t0,z9);

+  /* 2^5 - 2^0 = 31 */ fmult(z2_5_0,t0,z9);

   /* 2^6 - 2^1 */ fsquare(t0,z2_5_0);

   /* 2^7 - 2^2 */ fsquare(t1,t0);

@@ -519,37 +519,37 @@

   /* 2^8 - 2^3 */ fsquare(t0,t1);

   /* 2^9 - 2^4 */ fsquare(t1,t0);

   /* 2^10 - 2^5 */ fsquare(t0,t1);

-  /* 2^10 - 2^0 */ fmul(z2_10_0,t0,z2_5_0);

+  /* 2^10 - 2^0 */ fmult(z2_10_0,t0,z2_5_0);

   /* 2^11 - 2^1 */ fsquare(t0,z2_10_0);

   /* 2^12 - 2^2 */ fsquare(t1,t0);

   /* 2^20 - 2^10 */ for (i = 2;i < 10;i += 2) { fsquare(t0,t1); fsquare(t1,t0); }

-  /* 2^20 - 2^0 */ fmul(z2_20_0,t1,z2_10_0);

+  /* 2^20 - 2^0 */ fmult(z2_20_0,t1,z2_10_0);

   /* 2^21 - 2^1 */ fsquare(t0,z2_20_0);

   /* 2^22 - 2^2 */ fsquare(t1,t0);

   /* 2^40 - 2^20 */ for (i = 2;i < 20;i += 2) { fsquare(t0,t1); fsquare(t1,t0); }

-  /* 2^40 - 2^0 */ fmul(t0,t1,z2_20_0);

+  /* 2^40 - 2^0 */ fmult(t0,t1,z2_20_0);

   /* 2^41 - 2^1 */ fsquare(t1,t0);

   /* 2^42 - 2^2 */ fsquare(t0,t1);

   /* 2^50 - 2^10 */ for (i = 2;i < 10;i += 2) { fsquare(t1,t0); fsquare(t0,t1); }

-  /* 2^50 - 2^0 */ fmul(z2_50_0,t0,z2_10_0);

+  /* 2^50 - 2^0 */ fmult(z2_50_0,t0,z2_10_0);

   /* 2^51 - 2^1 */ fsquare(t0,z2_50_0);

   /* 2^52 - 2^2 */ fsquare(t1,t0);

   /* 2^100 - 2^50 */ for (i = 2;i < 50;i += 2) { fsquare(t0,t1); fsquare(t1,t0); }

-  /* 2^100 - 2^0 */ fmul(z2_100_0,t1,z2_50_0);

+  /* 2^100 - 2^0 */ fmult(z2_100_0,t1,z2_50_0);

   /* 2^101 - 2^1 */ fsquare(t1,z2_100_0);

   /* 2^102 - 2^2 */ fsquare(t0,t1);

   /* 2^200 - 2^100 */ for (i = 2;i < 100;i += 2) { fsquare(t1,t0); fsquare(t0,t1); }

-  /* 2^200 - 2^0 */ fmul(t1,t0,z2_100_0);

+  /* 2^200 - 2^0 */ fmult(t1,t0,z2_100_0);

   /* 2^201 - 2^1 */ fsquare(t0,t1);

   /* 2^202 - 2^2 */ fsquare(t1,t0);

   /* 2^250 - 2^50 */ for (i = 2;i < 50;i += 2) { fsquare(t0,t1); fsquare(t1,t0); }

-  /* 2^250 - 2^0 */ fmul(t0,t1,z2_50_0);

+  /* 2^250 - 2^0 */ fmult(t0,t1,z2_50_0);

   /* 2^251 - 2^1 */ fsquare(t1,t0);

   /* 2^252 - 2^2 */ fsquare(t0,t1);

@@ -556,7 +556,7 @@

   /* 2^253 - 2^3 */ fsquare(t1,t0);

   /* 2^254 - 2^4 */ fsquare(t0,t1);

   /* 2^255 - 2^5 */ fsquare(t1,t0);

-  /* 2^255 - 21 */ fmul(out,t1,z11);

+  /* 2^255 - 21 */ fmult(out,t1,z11);

 }

 void

@@ -565,6 +565,6 @@

   fexpand(bp, basepoint);

   cmult(x, z, secret, bp);

   crecip(zmone, z);

-  fmul(z, x, zmone);

+  fmult(z, x, zmone);

   fcontract(mypublic, z);

 }

-- 

⑨