Skip to content

Commit b20ab68

Browse files
armfazharmfazh
committedAug 9, 2022
Fix generation of code depending on io/ioutil.
1 parent 0aa8e47 commit b20ab68

File tree

6 files changed

+35
-35
lines changed

6 files changed

+35
-35
lines changed
 

‎dh/sidh/internal/p434/fp2.go

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

‎dh/sidh/internal/p503/fp2.go

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

‎dh/sidh/internal/p751/fp2.go

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

‎dh/sidh/internal/templates/fp2.gotemp

+4-4
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,8 @@ func sqr(dest, x *common.Fp2) {
148148

149149
// In case choice == 1, performs following swap in constant time:
150150
//
151-
// xPx <-> xQx
152-
// xPz <-> xQz
151+
// xPx <-> xQx
152+
// xPz <-> xQz
153153
//
154154
// Otherwise returns xPx, xPz, xQx, xQz unchanged
155155
func cswap(xPx, xPz, xQx, xQz *common.Fp2, choice uint8) {
@@ -161,8 +161,8 @@ func cswap(xPx, xPz, xQx, xQz *common.Fp2, choice uint8) {
161161

162162
// In case choice == 1, performs following moves in constant time:
163163
//
164-
// xPx <- xQx
165-
// xPz <- xQz
164+
// xPx <- xQx
165+
// xPz <- xQz
166166
//
167167
// Otherwise returns xPx, xPz, xQx, xQz unchanged
168168
func cmov(xPx, xPz, xQx, xQz *common.Fp2, choice uint8) {

‎pke/kyber/gen.go

+9-9
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ func generateParamsFiles() {
9393
if offset == -1 {
9494
panic("Missing template warning in params.templ.go")
9595
}
96-
err = io.WriteFile(mode.Pkg()+"/internal/params.go",
96+
err = os.WriteFile(mode.Pkg()+"/internal/params.go",
9797
[]byte(res[offset:]), 0o644)
9898
if err != nil {
9999
panic(err)
@@ -120,7 +120,7 @@ func generatePackageFiles() {
120120
if offset == -1 {
121121
panic("Missing template warning in pkg.templ.go")
122122
}
123-
err = io.WriteFile(mode.Pkg()+"/kyber.go", []byte(res[offset:]), 0o644)
123+
err = os.WriteFile(mode.Pkg()+"/kyber.go", []byte(res[offset:]), 0o644)
124124
if err != nil {
125125
panic(err)
126126
}
@@ -136,7 +136,7 @@ func generateSourceFiles() {
136136
return x == "params.go" || x == "params_test.go"
137137
}
138138

139-
fs, err := io.ReadDir("kyber512/internal")
139+
fs, err := os.ReadDir("kyber512/internal")
140140
if err != nil {
141141
panic(err)
142142
}
@@ -147,7 +147,7 @@ func generateSourceFiles() {
147147
if ignored(name) {
148148
continue
149149
}
150-
files[name], err = io.ReadFile(path.Join("kyber512/internal", name))
150+
files[name], err = os.ReadFile(path.Join("kyber512/internal", name))
151151
if err != nil {
152152
panic(err)
153153
}
@@ -159,7 +159,7 @@ func generateSourceFiles() {
159159
continue
160160
}
161161

162-
fs, err = io.ReadDir(path.Join(mode.Pkg(), "internal"))
162+
fs, err = os.ReadDir(path.Join(mode.Pkg(), "internal"))
163163
for _, f := range fs {
164164
name := f.Name()
165165
fn := path.Join(mode.Pkg(), "internal", name)
@@ -174,10 +174,10 @@ func generateSourceFiles() {
174174
panic(err)
175175
}
176176
}
177-
if f.Mode().IsDir() {
177+
if f.IsDir() {
178178
panic(fmt.Sprintf("%s: is a directory", fn))
179179
}
180-
if f.Mode()&os.ModeSymlink != 0 {
180+
if f.Type()&os.ModeSymlink != 0 {
181181
fmt.Printf("Removing symlink: %s\n", fn)
182182
err = os.Remove(fn)
183183
if err != nil {
@@ -193,14 +193,14 @@ func generateSourceFiles() {
193193
name,
194194
string(expected),
195195
))
196-
got, err := io.ReadFile(fn)
196+
got, err := os.ReadFile(fn)
197197
if err == nil {
198198
if bytes.Equal(got, expected) {
199199
continue
200200
}
201201
}
202202
fmt.Printf("Updating %s\n", fn)
203-
err = io.WriteFile(fn, expected, 0o644)
203+
err = os.WriteFile(fn, expected, 0o644)
204204
if err != nil {
205205
panic(err)
206206
}

‎sign/dilithium/gen.go

+10-10
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ func generateParamsFiles() {
153153
if offset == -1 {
154154
panic("Missing template warning in params.templ.go")
155155
}
156-
err = io.WriteFile(mode.Pkg()+"/internal/params.go",
156+
err = os.WriteFile(mode.Pkg()+"/internal/params.go",
157157
[]byte(res[offset:]), 0o644)
158158
if err != nil {
159159
panic(err)
@@ -180,7 +180,7 @@ func generateModeToplevelFiles() {
180180
if offset == -1 {
181181
panic("Missing template warning in mode.templ.go")
182182
}
183-
err = io.WriteFile(mode.Pkg()+".go", []byte(res[offset:]), 0o644)
183+
err = os.WriteFile(mode.Pkg()+".go", []byte(res[offset:]), 0o644)
184184
if err != nil {
185185
panic(err)
186186
}
@@ -206,7 +206,7 @@ func generateModePackageFiles() {
206206
if offset == -1 {
207207
panic("Missing template warning in modePkg.templ.go")
208208
}
209-
err = io.WriteFile(mode.Pkg()+"/dilithium.go", []byte(res[offset:]), 0o644)
209+
err = os.WriteFile(mode.Pkg()+"/dilithium.go", []byte(res[offset:]), 0o644)
210210
if err != nil {
211211
panic(err)
212212
}
@@ -223,7 +223,7 @@ func generateSourceFiles() {
223223
strings.HasSuffix(x, ".swp")
224224
}
225225

226-
fs, err := io.ReadDir("mode3/internal")
226+
fs, err := os.ReadDir("mode3/internal")
227227
if err != nil {
228228
panic(err)
229229
}
@@ -234,7 +234,7 @@ func generateSourceFiles() {
234234
if ignored(name) {
235235
continue
236236
}
237-
files[name], err = io.ReadFile(path.Join("mode3/internal", name))
237+
files[name], err = os.ReadFile(path.Join("mode3/internal", name))
238238
if err != nil {
239239
panic(err)
240240
}
@@ -246,7 +246,7 @@ func generateSourceFiles() {
246246
continue
247247
}
248248

249-
fs, err = io.ReadDir(path.Join(mode.Pkg(), "internal"))
249+
fs, err = os.ReadDir(path.Join(mode.Pkg(), "internal"))
250250
for _, f := range fs {
251251
name := f.Name()
252252
fn := path.Join(mode.Pkg(), "internal", name)
@@ -261,10 +261,10 @@ func generateSourceFiles() {
261261
panic(err)
262262
}
263263
}
264-
if f.Mode().IsDir() {
264+
if f.IsDir() {
265265
panic(fmt.Sprintf("%s: is a directory", fn))
266266
}
267-
if f.Mode()&os.ModeSymlink != 0 {
267+
if f.Type()&os.ModeSymlink != 0 {
268268
fmt.Printf("Removing symlink: %s\n", fn)
269269
err = os.Remove(fn)
270270
if err != nil {
@@ -280,14 +280,14 @@ func generateSourceFiles() {
280280
name,
281281
string(expected),
282282
))
283-
got, err := io.ReadFile(fn)
283+
got, err := os.ReadFile(fn)
284284
if err == nil {
285285
if bytes.Equal(got, expected) {
286286
continue
287287
}
288288
}
289289
fmt.Printf("Updating %s\n", fn)
290-
err = io.WriteFile(fn, expected, 0o644)
290+
err = os.WriteFile(fn, expected, 0o644)
291291
if err != nil {
292292
panic(err)
293293
}

0 commit comments

Comments
 (0)