Skip to content

Commit f705f34

Browse files
9EOR99EOR9
committed
Merge branch '3.1' into 3.3
2 parents 56178db + 289eaf2 commit f705f34

File tree

7 files changed

+93
-89
lines changed

7 files changed

+93
-89
lines changed

‎plugins/auth/ref10/fe_mul.c

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#include "fe.h"
22
#include "crypto_int64.h"
3+
#include "crypto_uint64.h"
34

45
/*
56
h = f * g
@@ -179,16 +180,16 @@ void fe_mul(fe h,const fe f,const fe g)
179180
crypto_int64 h7 = f0g7+f1g6 +f2g5 +f3g4 +f4g3 +f5g2 +f6g1 +f7g0 +f8g9_19+f9g8_19;
180181
crypto_int64 h8 = f0g8+f1g7_2 +f2g6 +f3g5_2 +f4g4 +f5g3_2 +f6g2 +f7g1_2 +f8g0 +f9g9_38;
181182
crypto_int64 h9 = f0g9+f1g8 +f2g7 +f3g6 +f4g5 +f5g4 +f6g3 +f7g2 +f8g1 +f9g0 ;
182-
crypto_int64 carry0;
183-
crypto_int64 carry1;
184-
crypto_int64 carry2;
185-
crypto_int64 carry3;
186-
crypto_int64 carry4;
187-
crypto_int64 carry5;
188-
crypto_int64 carry6;
189-
crypto_int64 carry7;
190-
crypto_int64 carry8;
191-
crypto_int64 carry9;
183+
crypto_uint64 carry0;
184+
crypto_uint64 carry1;
185+
crypto_uint64 carry2;
186+
crypto_uint64 carry3;
187+
crypto_uint64 carry4;
188+
crypto_uint64 carry5;
189+
crypto_uint64 carry6;
190+
crypto_uint64 carry7;
191+
crypto_uint64 carry8;
192+
crypto_uint64 carry9;
192193

193194
/*
194195
|h0| <= (1.65*1.65*2^52*(1+19+19+19+19)+1.65*1.65*2^50*(38+38+38+38+38))

‎plugins/auth/ref10/fe_sq.c

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#include "fe.h"
22
#include "crypto_int64.h"
3+
#include "crypto_uint64.h"
34

45
/*
56
h = f * f
@@ -106,16 +107,16 @@ void fe_sq(fe h,const fe f)
106107
crypto_int64 h7 = f0f7_2+f1f6_2 +f2f5_2 +f3f4_2 +f8f9_38;
107108
crypto_int64 h8 = f0f8_2+f1f7_4 +f2f6_2 +f3f5_4 +f4f4 +f9f9_38;
108109
crypto_int64 h9 = f0f9_2+f1f8_2 +f2f7_2 +f3f6_2 +f4f5_2;
109-
crypto_int64 carry0;
110-
crypto_int64 carry1;
111-
crypto_int64 carry2;
112-
crypto_int64 carry3;
113-
crypto_int64 carry4;
114-
crypto_int64 carry5;
115-
crypto_int64 carry6;
116-
crypto_int64 carry7;
117-
crypto_int64 carry8;
118-
crypto_int64 carry9;
110+
crypto_uint64 carry0;
111+
crypto_uint64 carry1;
112+
crypto_uint64 carry2;
113+
crypto_uint64 carry3;
114+
crypto_uint64 carry4;
115+
crypto_uint64 carry5;
116+
crypto_uint64 carry6;
117+
crypto_uint64 carry7;
118+
crypto_uint64 carry8;
119+
crypto_uint64 carry9;
119120

120121
carry0 = (h0 + (crypto_int64) (1<<25)) >> 26; h1 += carry0; h0 -= carry0 << 26;
121122
carry4 = (h4 + (crypto_int64) (1<<25)) >> 26; h5 += carry4; h4 -= carry4 << 26;

‎plugins/auth/ref10/fe_sq2.c

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#include "fe.h"
22
#include "crypto_int64.h"
3+
#include "crypto_uint64.h"
34

45
/*
56
h = 2 * f * f
@@ -106,16 +107,16 @@ void fe_sq2(fe h,const fe f)
106107
crypto_int64 h7 = f0f7_2+f1f6_2 +f2f5_2 +f3f4_2 +f8f9_38;
107108
crypto_int64 h8 = f0f8_2+f1f7_4 +f2f6_2 +f3f5_4 +f4f4 +f9f9_38;
108109
crypto_int64 h9 = f0f9_2+f1f8_2 +f2f7_2 +f3f6_2 +f4f5_2;
109-
crypto_int64 carry0;
110-
crypto_int64 carry1;
111-
crypto_int64 carry2;
112-
crypto_int64 carry3;
113-
crypto_int64 carry4;
114-
crypto_int64 carry5;
115-
crypto_int64 carry6;
116-
crypto_int64 carry7;
117-
crypto_int64 carry8;
118-
crypto_int64 carry9;
110+
crypto_uint64 carry0;
111+
crypto_uint64 carry1;
112+
crypto_uint64 carry2;
113+
crypto_uint64 carry3;
114+
crypto_uint64 carry4;
115+
crypto_uint64 carry5;
116+
crypto_uint64 carry6;
117+
crypto_uint64 carry7;
118+
crypto_uint64 carry8;
119+
crypto_uint64 carry9;
119120

120121
h0 += h0;
121122
h1 += h1;

‎plugins/auth/ref10/fe_tobytes.c

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#include "fe.h"
2+
#include "crypto_uint32.h"
23

34
/*
45
Preconditions:
@@ -38,16 +39,16 @@ void fe_tobytes(unsigned char *s,const fe h)
3839
crypto_int32 h8 = h[8];
3940
crypto_int32 h9 = h[9];
4041
crypto_int32 q;
41-
crypto_int32 carry0;
42-
crypto_int32 carry1;
43-
crypto_int32 carry2;
44-
crypto_int32 carry3;
45-
crypto_int32 carry4;
46-
crypto_int32 carry5;
47-
crypto_int32 carry6;
48-
crypto_int32 carry7;
49-
crypto_int32 carry8;
50-
crypto_int32 carry9;
42+
crypto_uint32 carry0;
43+
crypto_uint32 carry1;
44+
crypto_uint32 carry2;
45+
crypto_uint32 carry3;
46+
crypto_uint32 carry4;
47+
crypto_uint32 carry5;
48+
crypto_uint32 carry6;
49+
crypto_uint32 carry7;
50+
crypto_uint32 carry8;
51+
crypto_uint32 carry9;
5152

5253
q = (19 * h9 + (((crypto_int32) 1) << 24)) >> 25;
5354
q = (h0 + q) >> 26;
@@ -87,32 +88,32 @@ void fe_tobytes(unsigned char *s,const fe h)
8788
s[0] = h0 >> 0;
8889
s[1] = h0 >> 8;
8990
s[2] = h0 >> 16;
90-
s[3] = (h0 >> 24) | (h1 << 2);
91+
s[3] = (h0 >> 24) | ((crypto_uint32)h1 << 2);
9192
s[4] = h1 >> 6;
9293
s[5] = h1 >> 14;
93-
s[6] = (h1 >> 22) | (h2 << 3);
94+
s[6] = (h1 >> 22) | ((crypto_uint32)h2 << 3);
9495
s[7] = h2 >> 5;
9596
s[8] = h2 >> 13;
96-
s[9] = (h2 >> 21) | (h3 << 5);
97+
s[9] = (h2 >> 21) | ((crypto_uint32)h3 << 5);
9798
s[10] = h3 >> 3;
9899
s[11] = h3 >> 11;
99-
s[12] = (h3 >> 19) | (h4 << 6);
100+
s[12] = (h3 >> 19) | ((crypto_uint32)h4 << 6);
100101
s[13] = h4 >> 2;
101102
s[14] = h4 >> 10;
102103
s[15] = h4 >> 18;
103104
s[16] = h5 >> 0;
104105
s[17] = h5 >> 8;
105106
s[18] = h5 >> 16;
106-
s[19] = (h5 >> 24) | (h6 << 1);
107+
s[19] = (h5 >> 24) | ((crypto_uint32)h6 << 1);
107108
s[20] = h6 >> 7;
108109
s[21] = h6 >> 15;
109-
s[22] = (h6 >> 23) | (h7 << 3);
110+
s[22] = (h6 >> 23) | ((crypto_uint32)h7 << 3);
110111
s[23] = h7 >> 5;
111112
s[24] = h7 >> 13;
112-
s[25] = (h7 >> 21) | (h8 << 4);
113+
s[25] = (h7 >> 21) | ((crypto_uint32)h8 << 4);
113114
s[26] = h8 >> 4;
114115
s[27] = h8 >> 12;
115-
s[28] = (h8 >> 20) | (h9 << 6);
116+
s[28] = (h8 >> 20) | ((crypto_uint32)h9 << 6);
116117
s[29] = h9 >> 2;
117118
s[30] = h9 >> 10;
118119
s[31] = h9 >> 18;

‎plugins/auth/ref10/ge_scalarmult_base.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ static void select(ge_precomp *t,int pos,signed char b)
3535
{
3636
ge_precomp minust;
3737
unsigned char bnegative = negative(b);
38-
unsigned char babs = b - (((-bnegative) & b) << 1);
38+
unsigned char babs = b - ((unsigned char)((-bnegative) & b) << 1);
3939

4040
ge_precomp_0(t);
4141
cmov(t,&base[pos][0],equal(babs,1));

‎plugins/auth/ref10/sc_muladd.c

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -95,29 +95,29 @@ void sc_muladd(unsigned char *s,const unsigned char *a,const unsigned char *b,co
9595
crypto_int64 s21;
9696
crypto_int64 s22;
9797
crypto_int64 s23;
98-
crypto_int64 carry0;
99-
crypto_int64 carry1;
100-
crypto_int64 carry2;
101-
crypto_int64 carry3;
102-
crypto_int64 carry4;
103-
crypto_int64 carry5;
104-
crypto_int64 carry6;
105-
crypto_int64 carry7;
106-
crypto_int64 carry8;
107-
crypto_int64 carry9;
108-
crypto_int64 carry10;
109-
crypto_int64 carry11;
110-
crypto_int64 carry12;
111-
crypto_int64 carry13;
112-
crypto_int64 carry14;
113-
crypto_int64 carry15;
114-
crypto_int64 carry16;
115-
crypto_int64 carry17;
116-
crypto_int64 carry18;
117-
crypto_int64 carry19;
118-
crypto_int64 carry20;
119-
crypto_int64 carry21;
120-
crypto_int64 carry22;
98+
crypto_uint64 carry0;
99+
crypto_uint64 carry1;
100+
crypto_uint64 carry2;
101+
crypto_uint64 carry3;
102+
crypto_uint64 carry4;
103+
crypto_uint64 carry5;
104+
crypto_uint64 carry6;
105+
crypto_uint64 carry7;
106+
crypto_uint64 carry8;
107+
crypto_uint64 carry9;
108+
crypto_uint64 carry10;
109+
crypto_uint64 carry11;
110+
crypto_uint64 carry12;
111+
crypto_uint64 carry13;
112+
crypto_uint64 carry14;
113+
crypto_uint64 carry15;
114+
crypto_uint64 carry16;
115+
crypto_uint64 carry17;
116+
crypto_uint64 carry18;
117+
crypto_uint64 carry19;
118+
crypto_uint64 carry20;
119+
crypto_uint64 carry21;
120+
crypto_uint64 carry22;
121121

122122
s0 = c0 + a0*b0;
123123
s1 = c1 + a0*b1 + a1*b0;

‎plugins/auth/ref10/sc_reduce.c

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -58,23 +58,23 @@ void sc_reduce(unsigned char *s)
5858
crypto_int64 s21 = 2097151 & (load_3(s + 55) >> 1);
5959
crypto_int64 s22 = 2097151 & (load_4(s + 57) >> 6);
6060
crypto_int64 s23 = (load_4(s + 60) >> 3);
61-
crypto_int64 carry0;
62-
crypto_int64 carry1;
63-
crypto_int64 carry2;
64-
crypto_int64 carry3;
65-
crypto_int64 carry4;
66-
crypto_int64 carry5;
67-
crypto_int64 carry6;
68-
crypto_int64 carry7;
69-
crypto_int64 carry8;
70-
crypto_int64 carry9;
71-
crypto_int64 carry10;
72-
crypto_int64 carry11;
73-
crypto_int64 carry12;
74-
crypto_int64 carry13;
75-
crypto_int64 carry14;
76-
crypto_int64 carry15;
77-
crypto_int64 carry16;
61+
crypto_uint64 carry0;
62+
crypto_uint64 carry1;
63+
crypto_uint64 carry2;
64+
crypto_uint64 carry3;
65+
crypto_uint64 carry4;
66+
crypto_uint64 carry5;
67+
crypto_uint64 carry6;
68+
crypto_uint64 carry7;
69+
crypto_uint64 carry8;
70+
crypto_uint64 carry9;
71+
crypto_uint64 carry10;
72+
crypto_uint64 carry11;
73+
crypto_uint64 carry12;
74+
crypto_uint64 carry13;
75+
crypto_uint64 carry14;
76+
crypto_uint64 carry15;
77+
crypto_uint64 carry16;
7878

7979
s11 += s23 * 666643;
8080
s12 += s23 * 470296;

0 commit comments

Comments
 (0)