Skip to content

Commit a70c996

Browse files
author
algoidan
committed
CR fix
1 parent d6ea46b commit a70c996

File tree

5 files changed

+30
-31
lines changed

5 files changed

+30
-31
lines changed

‎crypto/libsodium-fork/src/libsodium/crypto_core/ed25519/ref10/ed25519_ref10_sc.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55

66
typedef unsigned __int128 uint128_t;
7-
#define HAVE_UINT128
87
#define mul64x64_128(out,a,b) out = (uint128_t)a * b;
98
#define shr128_pair(out,hi,lo,shift) out = (uint64_t)((((uint128_t)hi << 64) | lo) >> (shift));
109
#define shl128_pair(out,hi,lo,shift) out = (uint64_t)(((((uint128_t)hi << 64) | lo) << (shift)) >> 64);

‎crypto/libsodium-fork/src/libsodium/crypto_sign/ed25519/ref10/batch.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ ge25519_multi_scalarmult_vartime(ge25519_p3 *r, batch_heap *heap, size_t count)
225225
* 1 - for signature i passed verification
226226
* 0 - for siganture i failed verification
227227
*/
228-
int crypto_sign_ed25519_open_batch(const unsigned char **m, unsigned long long *mlen, const unsigned char **pk, const unsigned char **RS, size_t num, int *valid)
228+
int crypto_sign_ed25519_open_batch(const unsigned char **m, const unsigned long long *mlen, const unsigned char **pk, const unsigned char **RS, size_t num, int *valid_p)
229229
{
230230
batch_heap batch;
231231
ge25519_p3 p;
@@ -237,9 +237,9 @@ int crypto_sign_ed25519_open_batch(const unsigned char **m, unsigned long long *
237237
int ret = 0;
238238

239239
for (i = 0; i < num; i++)
240-
valid[i] = 1;
240+
valid_p[i] = 1;
241241

242-
while (num > 3) {
242+
while (num > 1) {
243243
batchsize = (num > MAX_BATCH_SIZE) ? MAX_BATCH_SIZE : num;
244244

245245
/* valida the public key and siganture */
@@ -294,23 +294,23 @@ int crypto_sign_ed25519_open_batch(const unsigned char **m, unsigned long long *
294294

295295
fallback:
296296
for (i = 0; i < batchsize; i++) {
297-
valid[i] = crypto_sign_ed25519_verify_detached(RS[i], m[i], mlen[i], pk[i]) ? 0 : 1;
298-
ret |= (valid[i] ^ 1);
297+
valid_p[i] = crypto_sign_ed25519_verify_detached(RS[i], m[i], mlen[i], pk[i]) ? 0 : 1;
298+
ret |= (valid_p[i] ^ 1);
299299
}
300300
}
301301
m += batchsize;
302302
mlen += batchsize;
303303
pk += batchsize;
304304
RS += batchsize;
305305
num -= batchsize;
306-
valid += batchsize;
306+
valid_p += batchsize;
307307

308308
}
309309

310310

311311
for (i = 0; i < num; i++) {
312-
valid[i] = crypto_sign_ed25519_verify_detached(RS[i], m[i], mlen[i], pk[i]) ? 0 : 1;
313-
ret |= (valid[i] ^ 1);
312+
valid_p[i] = crypto_sign_ed25519_verify_detached(RS[i], m[i], mlen[i], pk[i]) ? 0 : 1;
313+
ret |= (valid_p[i] ^ 1);
314314
}
315315

316316
return ret;

‎crypto/libsodium-fork/src/libsodium/crypto_sign/ed25519/ref10/sign_ed25519_ref10.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ int _crypto_sign_ed25519_verify_detached(const unsigned char *sig,
2121

2222

2323
int _crypto_sign_ed25519_open_batch(const unsigned char **m,
24-
unsigned long long *mlen,
24+
const unsigned long long *mlen,
2525
const unsigned char **pk,
2626
const unsigned char **RS,
2727
size_t num,
28-
int *valid);
28+
int *valid_p);
2929
#endif

‎crypto/libsodium-fork/src/libsodium/include/sodium/crypto_sign.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,9 @@ int crypto_sign_open(unsigned char *m, unsigned long long *mlen_p,
7474
__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(3, 5)));
7575

7676
SODIUM_EXPORT
77-
int crypto_sign_ed25519_open_batch(const unsigned char **m, unsigned long long *mlen,
77+
int crypto_sign_ed25519_open_batch(const unsigned char **m, const unsigned long long *mlen,
7878
const unsigned char **pk, const unsigned char **RS,
79-
size_t num, int *valid)
79+
size_t num, int *valid_p)
8080
__attribute__ ((warn_unused_result)) __attribute__ ((nonnull(1,2,3,4,6)));
8181

8282
SODIUM_EXPORT

‎crypto/libsodium-fork/test/default/sign.c‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1214,58 +1214,58 @@ static const char non_canoical_public_key[][3][500]=
12141214
static const char non_canoical_public_key_greater_than_field_element[][3][500]=
12151215
{
12161216
{"9bedc267423725d473888631ebf45988bad3db83851ee85c85e241a07d148b41",
1217-
"eeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", // 2^252-19+1
1217+
"eeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", // 2^255-19+1
12181218
"a9d55260f765261eb9b84e106f665e00b867287a761990d7135963ee0a7d59dca5bb704786be79fc476f91d3f3f89b03984d8068dcf1bb7dfc6637b45450ac04"} ,
12191219
{"9bedc267423725d473888631ebf45988bad3db83851ee85c85e241a07d148b41",
1220-
"efffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", // 2^252-19+2
1220+
"efffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", // 2^255-19+2
12211221
"a9d55260f765261eb9b84e106f665e00b867287a761990d7135963ee0a7d59dca5bb704786be79fc476f91d3f3f89b03984d8068dcf1bb7dfc6637b45450ac04"} ,
12221222
{"9bedc267423725d473888631ebf45988bad3db83851ee85c85e241a07d148b41",
1223-
"f0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", // 2^252-19+3
1223+
"f0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", // 2^255-19+3
12241224
"a9d55260f765261eb9b84e106f665e00b867287a761990d7135963ee0a7d59dca5bb704786be79fc476f91d3f3f89b03984d8068dcf1bb7dfc6637b45450ac04"} ,
12251225
{"9bedc267423725d473888631ebf45988bad3db83851ee85c85e241a07d148b41",
1226-
"f1ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", // 2^252-19+4
1226+
"f1ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", // 2^255-19+4
12271227
"a9d55260f765261eb9b84e106f665e00b867287a761990d7135963ee0a7d59dca5bb704786be79fc476f91d3f3f89b03984d8068dcf1bb7dfc6637b45450ac04"} ,
12281228
{"9bedc267423725d473888631ebf45988bad3db83851ee85c85e241a07d148b41",
1229-
"f2ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", // 2^252-19+5
1229+
"f2ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", // 2^255-19+5
12301230
"a9d55260f765261eb9b84e106f665e00b867287a761990d7135963ee0a7d59dca5bb704786be79fc476f91d3f3f89b03984d8068dcf1bb7dfc6637b45450ac04"} ,
12311231
{"9bedc267423725d473888631ebf45988bad3db83851ee85c85e241a07d148b41",
1232-
"f3ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", // 2^252-19+6
1232+
"f3ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", // 2^255-19+6
12331233
"a9d55260f765261eb9b84e106f665e00b867287a761990d7135963ee0a7d59dca5bb704786be79fc476f91d3f3f89b03984d8068dcf1bb7dfc6637b45450ac04"} ,
12341234
{"9bedc267423725d473888631ebf45988bad3db83851ee85c85e241a07d148b41",
1235-
"f4ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", // 2^252-19+7
1235+
"f4ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", // 2^255-19+7
12361236
"a9d55260f765261eb9b84e106f665e00b867287a761990d7135963ee0a7d59dca5bb704786be79fc476f91d3f3f89b03984d8068dcf1bb7dfc6637b45450ac04"} ,
12371237
{"9bedc267423725d473888631ebf45988bad3db83851ee85c85e241a07d148b41",
1238-
"f5ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", // 2^252-19+8
1238+
"f5ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", // 2^255-19+8
12391239
"a9d55260f765261eb9b84e106f665e00b867287a761990d7135963ee0a7d59dca5bb704786be79fc476f91d3f3f89b03984d8068dcf1bb7dfc6637b45450ac04"} ,
12401240
{"9bedc267423725d473888631ebf45988bad3db83851ee85c85e241a07d148b41",
1241-
"f6ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", // 2^252-19+9
1241+
"f6ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", // 2^255-19+9
12421242
"a9d55260f765261eb9b84e106f665e00b867287a761990d7135963ee0a7d59dca5bb704786be79fc476f91d3f3f89b03984d8068dcf1bb7dfc6637b45450ac04"} ,
12431243
{"9bedc267423725d473888631ebf45988bad3db83851ee85c85e241a07d148b41",
1244-
"f7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", // 2^252-19+10
1244+
"f7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", // 2^255-19+10
12451245
"a9d55260f765261eb9b84e106f665e00b867287a761990d7135963ee0a7d59dca5bb704786be79fc476f91d3f3f89b03984d8068dcf1bb7dfc6637b45450ac04"} ,
12461246
{"9bedc267423725d473888631ebf45988bad3db83851ee85c85e241a07d148b41",
1247-
"f8ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", // 2^252-19+11
1247+
"f8ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", // 2^255-19+11
12481248
"a9d55260f765261eb9b84e106f665e00b867287a761990d7135963ee0a7d59dca5bb704786be79fc476f91d3f3f89b03984d8068dcf1bb7dfc6637b45450ac04"} ,
12491249
{"9bedc267423725d473888631ebf45988bad3db83851ee85c85e241a07d148b41",
1250-
"f9ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", // 2^252-19+12
1250+
"f9ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", // 2^255-19+12
12511251
"a9d55260f765261eb9b84e106f665e00b867287a761990d7135963ee0a7d59dca5bb704786be79fc476f91d3f3f89b03984d8068dcf1bb7dfc6637b45450ac04"} ,
12521252
{"9bedc267423725d473888631ebf45988bad3db83851ee85c85e241a07d148b41",
1253-
"faffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", // 2^252-19+13
1253+
"faffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", // 2^255-19+13
12541254
"a9d55260f765261eb9b84e106f665e00b867287a761990d7135963ee0a7d59dca5bb704786be79fc476f91d3f3f89b03984d8068dcf1bb7dfc6637b45450ac04"} ,
12551255
{"9bedc267423725d473888631ebf45988bad3db83851ee85c85e241a07d148b41",
1256-
"fbffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", // 2^252-19+14
1256+
"fbffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", // 2^255-19+14
12571257
"a9d55260f765261eb9b84e106f665e00b867287a761990d7135963ee0a7d59dca5bb704786be79fc476f91d3f3f89b03984d8068dcf1bb7dfc6637b45450ac04"} ,
12581258
{"9bedc267423725d473888631ebf45988bad3db83851ee85c85e241a07d148b41",
1259-
"fcffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", // 2^252-19+15
1259+
"fcffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", // 2^255-19+15
12601260
"a9d55260f765261eb9b84e106f665e00b867287a761990d7135963ee0a7d59dca5bb704786be79fc476f91d3f3f89b03984d8068dcf1bb7dfc6637b45450ac04"} ,
12611261
{"9bedc267423725d473888631ebf45988bad3db83851ee85c85e241a07d148b41",
1262-
"fdffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", // 2^252-19+16
1262+
"fdffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", // 2^255-19+16
12631263
"a9d55260f765261eb9b84e106f665e00b867287a761990d7135963ee0a7d59dca5bb704786be79fc476f91d3f3f89b03984d8068dcf1bb7dfc6637b45450ac04"} ,
12641264
{"9bedc267423725d473888631ebf45988bad3db83851ee85c85e241a07d148b41",
1265-
"feffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", // 2^252-19+17
1265+
"feffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", // 2^255-19+17
12661266
"a9d55260f765261eb9b84e106f665e00b867287a761990d7135963ee0a7d59dca5bb704786be79fc476f91d3f3f89b03984d8068dcf1bb7dfc6637b45450ac04"} ,
12671267
{"9bedc267423725d473888631ebf45988bad3db83851ee85c85e241a07d148b41",
1268-
"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", // 2^252-19+18
1268+
"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", // 2^255-19+18
12691269
"a9d55260f765261eb9b84e106f665e00b867287a761990d7135963ee0a7d59dca5bb704786be79fc476f91d3f3f89b03984d8068dcf1bb7dfc6637b45450ac04"} ,
12701270
};
12711271

0 commit comments

Comments
 (0)