Skip to content

Commit 9dbf468

Browse files
whyvlarmfazh
andcommitted
field arithmetic cleanup
Co-authored-by: Armando Faz <armfazh@users.noreply.github.com>
1 parent d81cf1e commit 9dbf468

File tree

18 files changed

+238
-254
lines changed

18 files changed

+238
-254
lines changed

kem/mceliece/gen.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -57,39 +57,39 @@ func (m Instance) Is8192128() bool {
5757

5858
var (
5959
McElieceParam348864 = Param{
60-
Gf: "gf4096",
60+
Gf: "gf2e12",
6161
PublicKeySize: 261120,
6262
PrivateKeySize: 6492,
6363
CiphertextSize: 96,
6464
SysN: 3488,
6565
SysT: 64,
6666
}
6767
McElieceParam460896 = Param{
68-
Gf: "gf8192",
68+
Gf: "gf2e13",
6969
PublicKeySize: 524160,
7070
PrivateKeySize: 13608,
7171
CiphertextSize: 156,
7272
SysN: 4608,
7373
SysT: 96,
7474
}
7575
McElieceParam6688128 = Param{
76-
Gf: "gf8192",
76+
Gf: "gf2e13",
7777
PublicKeySize: 1044992,
7878
PrivateKeySize: 13932,
7979
CiphertextSize: 208,
8080
SysN: 6688,
8181
SysT: 128,
8282
}
8383
McElieceParam6960119 = Param{
84-
Gf: "gf8192",
84+
Gf: "gf2e13",
8585
PublicKeySize: 1047319,
8686
PrivateKeySize: 13948,
8787
CiphertextSize: 194,
8888
SysN: 6960,
8989
SysT: 119,
9090
}
9191
McElieceParam8192128 = Param{
92-
Gf: "gf8192",
92+
Gf: "gf2e13",
9393
PublicKeySize: 1357824,
9494
PrivateKeySize: 14120,
9595
CiphertextSize: 208,

kem/mceliece/internal/fft_const.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package internal
22

33
import (
4-
"github.com/cloudflare/circl/math/gf4096"
5-
"github.com/cloudflare/circl/math/gf8192"
4+
"github.com/cloudflare/circl/math/gf2e12"
5+
"github.com/cloudflare/circl/math/gf2e13"
66
)
77

88
var ButterfliesReversal4096 = [64]byte{
@@ -45,7 +45,7 @@ var RadixConversionsMask = [5][2]uint64{
4545
{0xFFFF000000000000, 0x0000FFFF00000000},
4646
}
4747

48-
var ButterfliesConst = [128][gf8192.GfBits]uint64{
48+
var ButterfliesConst = [128][gf2e13.Bits]uint64{
4949
{
5050
0x6969969669699696,
5151
0x9966669966999966,
@@ -1968,7 +1968,7 @@ var ButterfliesConst = [128][gf8192.GfBits]uint64{
19681968
},
19691969
}
19701970

1971-
var RadixConversionsS = [5][2][gf8192.GfBits]uint64{
1971+
var RadixConversionsS = [5][2][gf2e13.Bits]uint64{
19721972
{
19731973
{
19741974
0x3C3CF30C0000C003,
@@ -2131,7 +2131,7 @@ var RadixConversionsS = [5][2][gf8192.GfBits]uint64{
21312131
},
21322132
}
21332133

2134-
var RadixConversionsS4096 = [5][gf4096.GfBits]uint64{
2134+
var RadixConversionsS4096 = [5][gf2e12.Bits]uint64{
21352135
{
21362136
0xF3CFC030FC30F003,
21372137
0x3FCF0F003C00C00C,
@@ -2204,7 +2204,7 @@ var RadixConversionsS4096 = [5][gf4096.GfBits]uint64{
22042204
},
22052205
}
22062206

2207-
var ButterfliesConsts4096 = [63][gf4096.GfBits]uint64{
2207+
var ButterfliesConsts4096 = [63][gf2e12.Bits]uint64{
22082208
// 64
22092209
{
22102210
0xF00F0FF0F00F0FF0,

kem/mceliece/internal/powers.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package internal
22

33
import (
4-
"github.com/cloudflare/circl/math/gf4096"
5-
"github.com/cloudflare/circl/math/gf8192"
4+
"github.com/cloudflare/circl/math/gf2e12"
5+
"github.com/cloudflare/circl/math/gf2e13"
66
)
77

8-
var Powers4096 = [64][gf4096.GfBits]uint64{
8+
var Powers4096 = [64][gf2e12.Bits]uint64{
99
{
1010
0x0F0F0F0FF0F0F0F0,
1111
0xFFFF0000FFFF0000,
@@ -904,7 +904,7 @@ var Powers4096 = [64][gf4096.GfBits]uint64{
904904
},
905905
}
906906

907-
var Powers8192 = [128][gf8192.GfBits]uint64{
907+
var Powers8192 = [128][gf2e13.Bits]uint64{
908908
{
909909
0x5AA55AA5A55AA55A,
910910
0x3CC33CC3C33CC33C,

kem/mceliece/mceliece348864/mceliece.go

+17-17
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

kem/mceliece/mceliece348864f/mceliece.go

+17-17
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)