Consistent spacing
This commit is contained in:
parent
fd14a458d7
commit
1621448f6c
@ -1133,74 +1133,74 @@ sc25519_muladd(unsigned char *s, const unsigned char *a,
|
||||
s22 = a11 * b11;
|
||||
s23 = 0;
|
||||
|
||||
carry0 = (s0 + (int64_t)(1L << 20)) >> 21;
|
||||
carry0 = (s0 + (int64_t) (1L << 20)) >> 21;
|
||||
s1 += carry0;
|
||||
s0 -= carry0 * ((uint64_t) 1L << 21);
|
||||
carry2 = (s2 + (int64_t)(1L << 20)) >> 21;
|
||||
carry2 = (s2 + (int64_t) (1L << 20)) >> 21;
|
||||
s3 += carry2;
|
||||
s2 -= carry2 * ((uint64_t) 1L << 21);
|
||||
carry4 = (s4 + (int64_t)(1L << 20)) >> 21;
|
||||
carry4 = (s4 + (int64_t) (1L << 20)) >> 21;
|
||||
s5 += carry4;
|
||||
s4 -= carry4 * ((uint64_t) 1L << 21);
|
||||
carry6 = (s6 + (int64_t)(1L << 20)) >> 21;
|
||||
carry6 = (s6 + (int64_t) (1L << 20)) >> 21;
|
||||
s7 += carry6;
|
||||
s6 -= carry6 * ((uint64_t) 1L << 21);
|
||||
carry8 = (s8 + (int64_t)(1L << 20)) >> 21;
|
||||
carry8 = (s8 + (int64_t) (1L << 20)) >> 21;
|
||||
s9 += carry8;
|
||||
s8 -= carry8 * ((uint64_t) 1L << 21);
|
||||
carry10 = (s10 + (int64_t)(1L << 20)) >> 21;
|
||||
carry10 = (s10 + (int64_t) (1L << 20)) >> 21;
|
||||
s11 += carry10;
|
||||
s10 -= carry10 * ((uint64_t) 1L << 21);
|
||||
carry12 = (s12 + (int64_t)(1L << 20)) >> 21;
|
||||
carry12 = (s12 + (int64_t) (1L << 20)) >> 21;
|
||||
s13 += carry12;
|
||||
s12 -= carry12 * ((uint64_t) 1L << 21);
|
||||
carry14 = (s14 + (int64_t)(1L << 20)) >> 21;
|
||||
carry14 = (s14 + (int64_t) (1L << 20)) >> 21;
|
||||
s15 += carry14;
|
||||
s14 -= carry14 * ((uint64_t) 1L << 21);
|
||||
carry16 = (s16 + (int64_t)(1L << 20)) >> 21;
|
||||
carry16 = (s16 + (int64_t) (1L << 20)) >> 21;
|
||||
s17 += carry16;
|
||||
s16 -= carry16 * ((uint64_t) 1L << 21);
|
||||
carry18 = (s18 + (int64_t)(1L << 20)) >> 21;
|
||||
carry18 = (s18 + (int64_t) (1L << 20)) >> 21;
|
||||
s19 += carry18;
|
||||
s18 -= carry18 * ((uint64_t) 1L << 21);
|
||||
carry20 = (s20 + (int64_t)(1L << 20)) >> 21;
|
||||
carry20 = (s20 + (int64_t) (1L << 20)) >> 21;
|
||||
s21 += carry20;
|
||||
s20 -= carry20 * ((uint64_t) 1L << 21);
|
||||
carry22 = (s22 + (int64_t)(1L << 20)) >> 21;
|
||||
carry22 = (s22 + (int64_t) (1L << 20)) >> 21;
|
||||
s23 += carry22;
|
||||
s22 -= carry22 * ((uint64_t) 1L << 21);
|
||||
|
||||
carry1 = (s1 + (int64_t)(1L << 20)) >> 21;
|
||||
carry1 = (s1 + (int64_t) (1L << 20)) >> 21;
|
||||
s2 += carry1;
|
||||
s1 -= carry1 * ((uint64_t) 1L << 21);
|
||||
carry3 = (s3 + (int64_t)(1L << 20)) >> 21;
|
||||
carry3 = (s3 + (int64_t) (1L << 20)) >> 21;
|
||||
s4 += carry3;
|
||||
s3 -= carry3 * ((uint64_t) 1L << 21);
|
||||
carry5 = (s5 + (int64_t)(1L << 20)) >> 21;
|
||||
carry5 = (s5 + (int64_t) (1L << 20)) >> 21;
|
||||
s6 += carry5;
|
||||
s5 -= carry5 * ((uint64_t) 1L << 21);
|
||||
carry7 = (s7 + (int64_t)(1L << 20)) >> 21;
|
||||
carry7 = (s7 + (int64_t) (1L << 20)) >> 21;
|
||||
s8 += carry7;
|
||||
s7 -= carry7 * ((uint64_t) 1L << 21);
|
||||
carry9 = (s9 + (int64_t)(1L << 20)) >> 21;
|
||||
carry9 = (s9 + (int64_t) (1L << 20)) >> 21;
|
||||
s10 += carry9;
|
||||
s9 -= carry9 * ((uint64_t) 1L << 21);
|
||||
carry11 = (s11 + (int64_t)(1L << 20)) >> 21;
|
||||
carry11 = (s11 + (int64_t) (1L << 20)) >> 21;
|
||||
s12 += carry11;
|
||||
s11 -= carry11 * ((uint64_t) 1L << 21);
|
||||
carry13 = (s13 + (int64_t)(1L << 20)) >> 21;
|
||||
carry13 = (s13 + (int64_t) (1L << 20)) >> 21;
|
||||
s14 += carry13;
|
||||
s13 -= carry13 * ((uint64_t) 1L << 21);
|
||||
carry15 = (s15 + (int64_t)(1L << 20)) >> 21;
|
||||
carry15 = (s15 + (int64_t) (1L << 20)) >> 21;
|
||||
s16 += carry15;
|
||||
s15 -= carry15 * ((uint64_t) 1L << 21);
|
||||
carry17 = (s17 + (int64_t)(1L << 20)) >> 21;
|
||||
carry17 = (s17 + (int64_t) (1L << 20)) >> 21;
|
||||
s18 += carry17;
|
||||
s17 -= carry17 * ((uint64_t) 1L << 21);
|
||||
carry19 = (s19 + (int64_t)(1L << 20)) >> 21;
|
||||
carry19 = (s19 + (int64_t) (1L << 20)) >> 21;
|
||||
s20 += carry19;
|
||||
s19 -= carry19 * ((uint64_t) 1L << 21);
|
||||
carry21 = (s21 + (int64_t)(1L << 20)) >> 21;
|
||||
carry21 = (s21 + (int64_t) (1L << 20)) >> 21;
|
||||
s22 += carry21;
|
||||
s21 -= carry21 * ((uint64_t) 1L << 21);
|
||||
|
||||
@ -1246,38 +1246,38 @@ sc25519_muladd(unsigned char *s, const unsigned char *a,
|
||||
s10 += s18 * 136657;
|
||||
s11 -= s18 * 683901;
|
||||
|
||||
carry6 = (s6 + (int64_t)(1L << 20)) >> 21;
|
||||
carry6 = (s6 + (int64_t) (1L << 20)) >> 21;
|
||||
s7 += carry6;
|
||||
s6 -= carry6 * ((uint64_t) 1L << 21);
|
||||
carry8 = (s8 + (int64_t)(1L << 20)) >> 21;
|
||||
carry8 = (s8 + (int64_t) (1L << 20)) >> 21;
|
||||
s9 += carry8;
|
||||
s8 -= carry8 * ((uint64_t) 1L << 21);
|
||||
carry10 = (s10 + (int64_t)(1L << 20)) >> 21;
|
||||
carry10 = (s10 + (int64_t) (1L << 20)) >> 21;
|
||||
s11 += carry10;
|
||||
s10 -= carry10 * ((uint64_t) 1L << 21);
|
||||
carry12 = (s12 + (int64_t)(1L << 20)) >> 21;
|
||||
carry12 = (s12 + (int64_t) (1L << 20)) >> 21;
|
||||
s13 += carry12;
|
||||
s12 -= carry12 * ((uint64_t) 1L << 21);
|
||||
carry14 = (s14 + (int64_t)(1L << 20)) >> 21;
|
||||
carry14 = (s14 + (int64_t) (1L << 20)) >> 21;
|
||||
s15 += carry14;
|
||||
s14 -= carry14 * ((uint64_t) 1L << 21);
|
||||
carry16 = (s16 + (int64_t)(1L << 20)) >> 21;
|
||||
carry16 = (s16 + (int64_t) (1L << 20)) >> 21;
|
||||
s17 += carry16;
|
||||
s16 -= carry16 * ((uint64_t) 1L << 21);
|
||||
|
||||
carry7 = (s7 + (int64_t)(1L << 20)) >> 21;
|
||||
carry7 = (s7 + (int64_t) (1L << 20)) >> 21;
|
||||
s8 += carry7;
|
||||
s7 -= carry7 * ((uint64_t) 1L << 21);
|
||||
carry9 = (s9 + (int64_t)(1L << 20)) >> 21;
|
||||
carry9 = (s9 + (int64_t) (1L << 20)) >> 21;
|
||||
s10 += carry9;
|
||||
s9 -= carry9 * ((uint64_t) 1L << 21);
|
||||
carry11 = (s11 + (int64_t)(1L << 20)) >> 21;
|
||||
carry11 = (s11 + (int64_t) (1L << 20)) >> 21;
|
||||
s12 += carry11;
|
||||
s11 -= carry11 * ((uint64_t) 1L << 21);
|
||||
carry13 = (s13 + (int64_t)(1L << 20)) >> 21;
|
||||
carry13 = (s13 + (int64_t) (1L << 20)) >> 21;
|
||||
s14 += carry13;
|
||||
s13 -= carry13 * ((uint64_t) 1L << 21);
|
||||
carry15 = (s15 + (int64_t)(1L << 20)) >> 21;
|
||||
carry15 = (s15 + (int64_t) (1L << 20)) >> 21;
|
||||
s16 += carry15;
|
||||
s15 -= carry15 * ((uint64_t) 1L << 21);
|
||||
|
||||
@ -1324,41 +1324,41 @@ sc25519_muladd(unsigned char *s, const unsigned char *a,
|
||||
s5 -= s12 * 683901;
|
||||
s12 = 0;
|
||||
|
||||
carry0 = (s0 + (int64_t)(1L << 20)) >> 21;
|
||||
carry0 = (s0 + (int64_t) (1L << 20)) >> 21;
|
||||
s1 += carry0;
|
||||
s0 -= carry0 * ((uint64_t) 1L << 21);
|
||||
carry2 = (s2 + (int64_t)(1L << 20)) >> 21;
|
||||
carry2 = (s2 + (int64_t) (1L << 20)) >> 21;
|
||||
s3 += carry2;
|
||||
s2 -= carry2 * ((uint64_t) 1L << 21);
|
||||
carry4 = (s4 + (int64_t)(1L << 20)) >> 21;
|
||||
carry4 = (s4 + (int64_t) (1L << 20)) >> 21;
|
||||
s5 += carry4;
|
||||
s4 -= carry4 * ((uint64_t) 1L << 21);
|
||||
carry6 = (s6 + (int64_t)(1L << 20)) >> 21;
|
||||
carry6 = (s6 + (int64_t) (1L << 20)) >> 21;
|
||||
s7 += carry6;
|
||||
s6 -= carry6 * ((uint64_t) 1L << 21);
|
||||
carry8 = (s8 + (int64_t)(1L << 20)) >> 21;
|
||||
carry8 = (s8 + (int64_t) (1L << 20)) >> 21;
|
||||
s9 += carry8;
|
||||
s8 -= carry8 * ((uint64_t) 1L << 21);
|
||||
carry10 = (s10 + (int64_t)(1L << 20)) >> 21;
|
||||
carry10 = (s10 + (int64_t) (1L << 20)) >> 21;
|
||||
s11 += carry10;
|
||||
s10 -= carry10 * ((uint64_t) 1L << 21);
|
||||
|
||||
carry1 = (s1 + (int64_t)(1L << 20)) >> 21;
|
||||
carry1 = (s1 + (int64_t) (1L << 20)) >> 21;
|
||||
s2 += carry1;
|
||||
s1 -= carry1 * ((uint64_t) 1L << 21);
|
||||
carry3 = (s3 + (int64_t)(1L << 20)) >> 21;
|
||||
carry3 = (s3 + (int64_t) (1L << 20)) >> 21;
|
||||
s4 += carry3;
|
||||
s3 -= carry3 * ((uint64_t) 1L << 21);
|
||||
carry5 = (s5 + (int64_t)(1L << 20)) >> 21;
|
||||
carry5 = (s5 + (int64_t) (1L << 20)) >> 21;
|
||||
s6 += carry5;
|
||||
s5 -= carry5 * ((uint64_t) 1L << 21);
|
||||
carry7 = (s7 + (int64_t)(1L << 20)) >> 21;
|
||||
carry7 = (s7 + (int64_t) (1L << 20)) >> 21;
|
||||
s8 += carry7;
|
||||
s7 -= carry7 * ((uint64_t) 1L << 21);
|
||||
carry9 = (s9 + (int64_t)(1L << 20)) >> 21;
|
||||
carry9 = (s9 + (int64_t) (1L << 20)) >> 21;
|
||||
s10 += carry9;
|
||||
s9 -= carry9 * ((uint64_t) 1L << 21);
|
||||
carry11 = (s11 + (int64_t)(1L << 20)) >> 21;
|
||||
carry11 = (s11 + (int64_t) (1L << 20)) >> 21;
|
||||
s12 += carry11;
|
||||
s11 -= carry11 * ((uint64_t) 1L << 21);
|
||||
|
||||
@ -1580,38 +1580,38 @@ sc25519_reduce(unsigned char *s)
|
||||
s10 += s18 * 136657;
|
||||
s11 -= s18 * 683901;
|
||||
|
||||
carry6 = (s6 + (int64_t)(1L << 20)) >> 21;
|
||||
carry6 = (s6 + (int64_t) (1L << 20)) >> 21;
|
||||
s7 += carry6;
|
||||
s6 -= carry6 * ((uint64_t) 1L << 21);
|
||||
carry8 = (s8 + (int64_t)(1L << 20)) >> 21;
|
||||
carry8 = (s8 + (int64_t) (1L << 20)) >> 21;
|
||||
s9 += carry8;
|
||||
s8 -= carry8 * ((uint64_t) 1L << 21);
|
||||
carry10 = (s10 + (int64_t)(1L << 20)) >> 21;
|
||||
carry10 = (s10 + (int64_t) (1L << 20)) >> 21;
|
||||
s11 += carry10;
|
||||
s10 -= carry10 * ((uint64_t) 1L << 21);
|
||||
carry12 = (s12 + (int64_t)(1L << 20)) >> 21;
|
||||
carry12 = (s12 + (int64_t) (1L << 20)) >> 21;
|
||||
s13 += carry12;
|
||||
s12 -= carry12 * ((uint64_t) 1L << 21);
|
||||
carry14 = (s14 + (int64_t)(1L << 20)) >> 21;
|
||||
carry14 = (s14 + (int64_t) (1L << 20)) >> 21;
|
||||
s15 += carry14;
|
||||
s14 -= carry14 * ((uint64_t) 1L << 21);
|
||||
carry16 = (s16 + (int64_t)(1L << 20)) >> 21;
|
||||
carry16 = (s16 + (int64_t) (1L << 20)) >> 21;
|
||||
s17 += carry16;
|
||||
s16 -= carry16 * ((uint64_t) 1L << 21);
|
||||
|
||||
carry7 = (s7 + (int64_t)(1L << 20)) >> 21;
|
||||
carry7 = (s7 + (int64_t) (1L << 20)) >> 21;
|
||||
s8 += carry7;
|
||||
s7 -= carry7 * ((uint64_t) 1L << 21);
|
||||
carry9 = (s9 + (int64_t)(1L << 20)) >> 21;
|
||||
carry9 = (s9 + (int64_t) (1L << 20)) >> 21;
|
||||
s10 += carry9;
|
||||
s9 -= carry9 * ((uint64_t) 1L << 21);
|
||||
carry11 = (s11 + (int64_t)(1L << 20)) >> 21;
|
||||
carry11 = (s11 + (int64_t) (1L << 20)) >> 21;
|
||||
s12 += carry11;
|
||||
s11 -= carry11 * ((uint64_t) 1L << 21);
|
||||
carry13 = (s13 + (int64_t)(1L << 20)) >> 21;
|
||||
carry13 = (s13 + (int64_t) (1L << 20)) >> 21;
|
||||
s14 += carry13;
|
||||
s13 -= carry13 * ((uint64_t) 1L << 21);
|
||||
carry15 = (s15 + (int64_t)(1L << 20)) >> 21;
|
||||
carry15 = (s15 + (int64_t) (1L << 20)) >> 21;
|
||||
s16 += carry15;
|
||||
s15 -= carry15 * ((uint64_t) 1L << 21);
|
||||
|
||||
@ -1658,41 +1658,41 @@ sc25519_reduce(unsigned char *s)
|
||||
s5 -= s12 * 683901;
|
||||
s12 = 0;
|
||||
|
||||
carry0 = (s0 + (int64_t)(1L << 20)) >> 21;
|
||||
carry0 = (s0 + (int64_t) (1L << 20)) >> 21;
|
||||
s1 += carry0;
|
||||
s0 -= carry0 * ((uint64_t) 1L << 21);
|
||||
carry2 = (s2 + (int64_t)(1L << 20)) >> 21;
|
||||
carry2 = (s2 + (int64_t) (1L << 20)) >> 21;
|
||||
s3 += carry2;
|
||||
s2 -= carry2 * ((uint64_t) 1L << 21);
|
||||
carry4 = (s4 + (int64_t)(1L << 20)) >> 21;
|
||||
carry4 = (s4 + (int64_t) (1L << 20)) >> 21;
|
||||
s5 += carry4;
|
||||
s4 -= carry4 * ((uint64_t) 1L << 21);
|
||||
carry6 = (s6 + (int64_t)(1L << 20)) >> 21;
|
||||
carry6 = (s6 + (int64_t) (1L << 20)) >> 21;
|
||||
s7 += carry6;
|
||||
s6 -= carry6 * ((uint64_t) 1L << 21);
|
||||
carry8 = (s8 + (int64_t)(1L << 20)) >> 21;
|
||||
carry8 = (s8 + (int64_t) (1L << 20)) >> 21;
|
||||
s9 += carry8;
|
||||
s8 -= carry8 * ((uint64_t) 1L << 21);
|
||||
carry10 = (s10 + (int64_t)(1L << 20)) >> 21;
|
||||
carry10 = (s10 + (int64_t) (1L << 20)) >> 21;
|
||||
s11 += carry10;
|
||||
s10 -= carry10 * ((uint64_t) 1L << 21);
|
||||
|
||||
carry1 = (s1 + (int64_t)(1L << 20)) >> 21;
|
||||
carry1 = (s1 + (int64_t) (1L << 20)) >> 21;
|
||||
s2 += carry1;
|
||||
s1 -= carry1 * ((uint64_t) 1L << 21);
|
||||
carry3 = (s3 + (int64_t)(1L << 20)) >> 21;
|
||||
carry3 = (s3 + (int64_t) (1L << 20)) >> 21;
|
||||
s4 += carry3;
|
||||
s3 -= carry3 * ((uint64_t) 1L << 21);
|
||||
carry5 = (s5 + (int64_t)(1L << 20)) >> 21;
|
||||
carry5 = (s5 + (int64_t) (1L << 20)) >> 21;
|
||||
s6 += carry5;
|
||||
s5 -= carry5 * ((uint64_t) 1L << 21);
|
||||
carry7 = (s7 + (int64_t)(1L << 20)) >> 21;
|
||||
carry7 = (s7 + (int64_t) (1L << 20)) >> 21;
|
||||
s8 += carry7;
|
||||
s7 -= carry7 * ((uint64_t) 1L << 21);
|
||||
carry9 = (s9 + (int64_t)(1L << 20)) >> 21;
|
||||
carry9 = (s9 + (int64_t) (1L << 20)) >> 21;
|
||||
s10 += carry9;
|
||||
s9 -= carry9 * ((uint64_t) 1L << 21);
|
||||
carry11 = (s11 + (int64_t)(1L << 20)) >> 21;
|
||||
carry11 = (s11 + (int64_t) (1L << 20)) >> 21;
|
||||
s12 += carry11;
|
||||
s11 -= carry11 * ((uint64_t) 1L << 21);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user