Skip to content

Commit 36b00d3

Browse files
committed
upstream: remove whitespace at EOL from code extracted from SUPERCOP
OpenBSD-Commit-ID: 1ec524ff2fbb9387d731601437c82008f35a60f4
1 parent d888de0 commit 36b00d3

File tree

2 files changed

+24
-23
lines changed

2 files changed

+24
-23
lines changed

sntrup761.c

+22-22
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $OpenBSD: sntrup761.c,v 1.5 2021/01/08 02:33:13 dtucker Exp $ */
1+
/* $OpenBSD: sntrup761.c,v 1.6 2023/01/11 02:13:52 djm Exp $ */
22

33
/*
44
* Public Domain, Authors:
@@ -119,7 +119,7 @@ This software is designed to take time independent of x.
119119
Time still varies depending on m; user must ensure that m is constant.
120120
Time also varies on CPUs where multiplication is variable-time.
121121
There could be more CPU issues.
122-
There could also be compiler issues.
122+
There could also be compiler issues.
123123
*/
124124

125125
static void uint32_divmod_uint14(uint32 *q,uint16 *r,uint32 x,uint16 m)
@@ -447,7 +447,7 @@ static Fq Fq_freeze(int32 x)
447447
#ifndef LPR
448448

449449
static Fq Fq_recip(Fq a1)
450-
{
450+
{
451451
int i = 1;
452452
Fq ai = a1;
453453

@@ -456,7 +456,7 @@ static Fq Fq_recip(Fq a1)
456456
i += 1;
457457
}
458458
return ai;
459-
}
459+
}
460460

461461
#endif
462462

@@ -525,47 +525,47 @@ static void R3_mult(small *h,const small *f,const small *g)
525525

526526
/* returns 0 if recip succeeded; else -1 */
527527
static int R3_recip(small *out,const small *in)
528-
{
528+
{
529529
small f[p+1],g[p+1],v[p+1],r[p+1];
530530
int i,loop,delta;
531531
int sign,swap,t;
532-
532+
533533
for (i = 0;i < p+1;++i) v[i] = 0;
534534
for (i = 0;i < p+1;++i) r[i] = 0;
535535
r[0] = 1;
536536
for (i = 0;i < p;++i) f[i] = 0;
537537
f[0] = 1; f[p-1] = f[p] = -1;
538538
for (i = 0;i < p;++i) g[p-1-i] = in[i];
539539
g[p] = 0;
540-
541-
delta = 1;
540+
541+
delta = 1;
542542

543543
for (loop = 0;loop < 2*p-1;++loop) {
544544
for (i = p;i > 0;--i) v[i] = v[i-1];
545545
v[0] = 0;
546-
546+
547547
sign = -g[0]*f[0];
548548
swap = int16_negative_mask(-delta) & int16_nonzero_mask(g[0]);
549549
delta ^= swap&(delta^-delta);
550550
delta += 1;
551-
551+
552552
for (i = 0;i < p+1;++i) {
553553
t = swap&(f[i]^g[i]); f[i] ^= t; g[i] ^= t;
554554
t = swap&(v[i]^r[i]); v[i] ^= t; r[i] ^= t;
555555
}
556-
556+
557557
for (i = 0;i < p+1;++i) g[i] = F3_freeze(g[i]+sign*f[i]);
558558
for (i = 0;i < p+1;++i) r[i] = F3_freeze(r[i]+sign*v[i]);
559559

560560
for (i = 0;i < p;++i) g[i] = g[i+1];
561561
g[p] = 0;
562562
}
563-
563+
564564
sign = f[0];
565565
for (i = 0;i < p;++i) out[i] = sign*v[p-1-i];
566-
566+
567567
return int16_nonzero_mask(delta);
568-
}
568+
}
569569

570570
#endif
571571

@@ -603,14 +603,14 @@ static void Rq_mult_small(Fq *h,const Fq *f,const small *g)
603603
static void Rq_mult3(Fq *h,const Fq *f)
604604
{
605605
int i;
606-
606+
607607
for (i = 0;i < p;++i) h[i] = Fq_freeze(3*f[i]);
608608
}
609609

610610
/* out = 1/(3*in) in Rq */
611611
/* returns 0 if recip succeeded; else -1 */
612612
static int Rq_recip3(Fq *out,const small *in)
613-
{
613+
{
614614
Fq f[p+1],g[p+1],v[p+1],r[p+1];
615615
int i,loop,delta;
616616
int swap,t;
@@ -739,7 +739,7 @@ static void KeyGen(Fq *h,small *f,small *ginv)
739739
{
740740
small g[p];
741741
Fq finv[p];
742-
742+
743743
for (;;) {
744744
Small_random(g);
745745
if (R3_recip(ginv,g) == 0) break;
@@ -777,7 +777,7 @@ static void Decrypt(small *r,const Fq *c,const small *f,const small *ginv)
777777
for (i = 0;i < w;++i) r[i] = ((ev[i]^1)&~mask)^1;
778778
for (i = w;i < p;++i) r[i] = ev[i]&~mask;
779779
}
780-
780+
781781
#endif
782782

783783
/* ----- NTRU LPRime Core */
@@ -817,7 +817,7 @@ static void Decrypt(int8 *r,const Fq *B,const int8 *T,const small *a)
817817
for (i = 0;i < I;++i)
818818
r[i] = -int16_negative_mask(Fq_freeze(Right(T[i])-aB[i]+4*w+1));
819819
}
820-
820+
821821
#endif
822822

823823
/* ----- encoding I-bit inputs */
@@ -898,7 +898,7 @@ static void HashShort(small *out,const Inputs r)
898898
}
899899

900900
#endif
901-
901+
902902
/* ----- NTRU LPRime Expand */
903903

904904
#ifdef LPR
@@ -974,7 +974,7 @@ static void Rq_encode(unsigned char *s,const Fq *r)
974974
{
975975
uint16 R[p],M[p];
976976
int i;
977-
977+
978978
for (i = 0;i < p;++i) R[i] = r[i]+q12;
979979
for (i = 0;i < p;++i) M[i] = q;
980980
Encode(s,R,M,p);
@@ -989,7 +989,7 @@ static void Rq_decode(Fq *r,const unsigned char *s)
989989
Decode(R,s,M,p);
990990
for (i = 0;i < p;++i) r[i] = ((Fq)R[i])-q12;
991991
}
992-
992+
993993
#endif
994994

995995
/* ----- encoding rounded polynomials */

sntrup761.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/sh
2-
# $OpenBSD: sntrup761.sh,v 1.6 2022/12/26 19:16:03 jmc Exp $
2+
# $OpenBSD: sntrup761.sh,v 1.7 2023/01/11 02:13:52 djm Exp $
33
# Placed in the Public Domain.
44
#
55
AUTHOR="supercop-20201130/crypto_kem/sntrup761/ref/implementors"
@@ -54,6 +54,7 @@ for i in $FILES; do
5454
-e "/^extern /d" \
5555
-e '/CRYPTO_NAMESPACE/d' \
5656
-e "/^#define int32 crypto_int32/d" \
57+
-e 's/[ ]*$//' \
5758
$i | \
5859
case "$i" in
5960
# Use int64_t for intermediate values in int32_MINMAX to prevent signed

0 commit comments

Comments
 (0)