Skip to content

Commit a58468e

Browse files
committed
update go to latest
1 parent 84b2265 commit a58468e

10 files changed

Lines changed: 31 additions & 42 deletions

File tree

.github/workflows/check-go-validation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: Set up Go
1616
uses: actions/setup-go@v5
1717
with:
18-
go-version: 1.24
18+
go-version: 1.24.0
1919
- name: Build
2020
run: go build -v . && go build -v ./...
2121
- name: Test

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.18
1+
FROM golang:1.24.0
22

33
RUN mkdir /trezord-go
44
WORKDIR /trezord-go

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
native:
2-
CGO_ENABLED=1 go build $(GOFLAGS)
2+
CGO_ENABLED=1 go build -buildvcs=false $(GOFLAGS)
33

44
build-release:
55
make -C release clean all

go.mod

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,18 @@
11
module github.com/trezor/trezord-go
22

3-
go 1.12
3+
go 1.24.0
44

55
require (
6-
github.com/BurntSushi/toml v0.3.1 // indirect
76
github.com/gorilla/csrf v1.7.0
87
github.com/gorilla/handlers v1.5.1
98
github.com/gorilla/mux v1.8.0
109
gopkg.in/natefinch/lumberjack.v2 v2.0.0
10+
)
11+
12+
require (
13+
github.com/BurntSushi/toml v0.3.1 // indirect
14+
github.com/felixge/httpsnoop v1.0.1 // indirect
15+
github.com/gorilla/securecookie v1.1.1 // indirect
16+
github.com/pkg/errors v0.9.1 // indirect
1117
gopkg.in/yaml.v2 v2.4.0 // indirect
1218
)

go.sum

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ github.com/gorilla/securecookie v1.1.1 h1:miw7JPhV+b/lAHSXz4qd/nN9jRiAFV5FwjeKyC
1212
github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4=
1313
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
1414
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
15-
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
1615
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
1716
gopkg.in/natefinch/lumberjack.v2 v2.0.0 h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXLknAOE8=
1817
gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k=

release/linux/Dockerfile.build

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
FROM messense/rust-musl-cross:aarch64-musl AS go-arm64-musl
2-
COPY --from=golang:1.19.1 /usr/local/go/ /usr/local/go/
2+
COPY --from=golang:1.24.0 /usr/local/go/ /usr/local/go/
33
ENV TREZORD_BUILD=go-arm64-musl
44

55
FROM messense/rust-musl-cross:i686-musl AS go-386-musl
6-
COPY --from=golang:1.19.1 /usr/local/go/ /usr/local/go/
6+
COPY --from=golang:1.24.0 /usr/local/go/ /usr/local/go/
77
ENV TREZORD_BUILD=go-386-musl
88

99
FROM messense/rust-musl-cross:x86_64-musl AS go-amd64-musl
10-
COPY --from=golang:1.19.1 /usr/local/go/ /usr/local/go/
10+
COPY --from=golang:1.24.0 /usr/local/go/ /usr/local/go/
1111
ENV TREZORD_BUILD=go-amd64-musl

release/macos/Makefile

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,22 +20,25 @@ clean:
2020
-v $(IMPORT_PATH):/trezord \
2121
-w /trezord \
2222
-e CGO_ENABLED=1 \
23-
docker.elastic.co/beats-dev/golang-crossbuild:1.19-darwin-debian10 \
23+
-e GOFLAGS="-buildvcs=false" \
24+
docker.elastic.co/beats-dev/golang-crossbuild:1.24.0-darwin-debian12 \
2425
--build-cmd "go build -o release/macos/build/trezord-amd64 -ldflags=-s" \
2526
-p "darwin/amd64"
2627
docker run --rm \
2728
-v $(IMPORT_PATH):/trezord \
2829
-w /trezord \
2930
-e CGO_ENABLED=1 \
30-
docker.elastic.co/beats-dev/golang-crossbuild:1.19-darwin-arm64-debian10 \
31+
-e GOFLAGS="-buildvcs=false" \
32+
docker.elastic.co/beats-dev/golang-crossbuild:1.24.0-darwin-arm64-debian12 \
3133
--build-cmd "go build -o release/macos/build/trezord-arm64 -ldflags=-s" \
3234
-p "darwin/arm64"
3335
docker run --rm \
3436
-v $(IMPORT_PATH):/trezord \
3537
-w /trezord \
3638
-e CGO_ENABLED=1 \
39+
-e GOFLAGS="-buildvcs=false" \
3740
--entrypoint /trezord/release/macos/build-fat.sh \
38-
docker.elastic.co/beats-dev/golang-crossbuild:1.19-darwin-arm64-debian10
41+
docker.elastic.co/beats-dev/golang-crossbuild:1.24.0-darwin-arm64-debian12
3942
cp ../../VERSION build
4043

4144
.package: .binary .docker-image

release/windows/Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,17 @@ clean:
1919
-w /trezord \
2020
-e CGO_ENABLED=1 \
2121
-e CGO_CFLAGS="-D_WIN32_WINNT=0x0600" \
22-
docker.elastic.co/beats-dev/golang-crossbuild:1.19-main-debian10 \
22+
-e GOFLAGS="-buildvcs=false" \
23+
docker.elastic.co/beats-dev/golang-crossbuild:1.24.0-main-debian12 \
2324
--build-cmd "go build -o release/windows/build/trezord-64b.exe -ldflags=\"-H=windowsgui\"" \
2425
-p "windows/amd64"
2526
docker run --rm \
2627
-v $(IMPORT_PATH):/trezord \
2728
-w /trezord \
2829
-e CGO_ENABLED=1 \
2930
-e CGO_CFLAGS="-D_WIN32_WINNT=0x0600" \
30-
docker.elastic.co/beats-dev/golang-crossbuild:1.19-main-debian10 \
31+
-e GOFLAGS="-buildvcs=false" \
32+
docker.elastic.co/beats-dev/golang-crossbuild:1.24.0-main-debian12 \
3133
--build-cmd "go build -o release/windows/build/trezord-32b.exe -ldflags=\"-H=windowsgui\"" \
3234
-p "windows/386"
3335
cp ../../VERSION build

server/api/api.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package api
33
import (
44
"encoding/hex"
55
"encoding/json"
6-
"io/ioutil"
6+
"io"
77
"net/http"
88
"regexp"
99

@@ -200,7 +200,7 @@ func (a *api) call(w http.ResponseWriter, r *http.Request, mode core.CallMode, d
200200

201201
var binbody []byte
202202
if mode != core.CallModeRead {
203-
hexbody, err := ioutil.ReadAll(r.Body)
203+
hexbody, err := io.ReadAll(r.Body)
204204
if err != nil {
205205
a.respondError(w, err)
206206
return

usb/lowlevel/libusb/libusb.go

Lines changed: 5 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@ import "C"
104104

105105
import (
106106
"fmt"
107-
"reflect"
108107
"strings"
109108
"unsafe"
110109
)
@@ -459,11 +458,7 @@ type Interface_Descriptor struct {
459458
}
460459

461460
func (x *Struct_Libusb_Interface_Descriptor) c2go() *Interface_Descriptor {
462-
var list []Struct_Libusb_Endpoint_Descriptor
463-
hdr := (*reflect.SliceHeader)(unsafe.Pointer(&list))
464-
hdr.Cap = int(x.bNumEndpoints)
465-
hdr.Len = int(x.bNumEndpoints)
466-
hdr.Data = uintptr(unsafe.Pointer(x.endpoint))
461+
list := unsafe.Slice((*Struct_Libusb_Endpoint_Descriptor)(unsafe.Pointer(x.endpoint)), int(x.bNumEndpoints))
467462
endpoints := make([]*Endpoint_Descriptor, x.bNumEndpoints)
468463
for i := range endpoints {
469464
endpoints[i] = (&list[i]).c2go()
@@ -517,11 +512,7 @@ type Interface struct {
517512
}
518513

519514
func (x *Struct_Libusb_Interface) c2go() *Interface {
520-
var list []Struct_Libusb_Interface_Descriptor
521-
hdr := (*reflect.SliceHeader)(unsafe.Pointer(&list))
522-
hdr.Cap = int(x.num_altsetting)
523-
hdr.Len = int(x.num_altsetting)
524-
hdr.Data = uintptr(unsafe.Pointer(x.altsetting))
515+
list := unsafe.Slice((*Struct_Libusb_Interface_Descriptor)(unsafe.Pointer(x.altsetting)), int(x.num_altsetting))
525516
altsetting := make([]*Interface_Descriptor, x.num_altsetting)
526517
for i := range altsetting {
527518
altsetting[i] = (&list[i]).c2go()
@@ -567,11 +558,7 @@ type Config_Descriptor struct {
567558
}
568559

569560
func (x *Struct_Libusb_Config_Descriptor) c2go() *Config_Descriptor {
570-
var list []Struct_Libusb_Interface
571-
hdr := (*reflect.SliceHeader)(unsafe.Pointer(&list))
572-
hdr.Cap = int(x.bNumInterfaces)
573-
hdr.Len = int(x.bNumInterfaces)
574-
hdr.Data = uintptr(unsafe.Pointer(x._interface))
561+
list := unsafe.Slice((*Struct_Libusb_Interface)(unsafe.Pointer(x._interface)), int(x.bNumInterfaces))
575562
interfaces := make([]*Interface, x.bNumInterfaces)
576563
for i := range interfaces {
577564
interfaces[i] = (&list[i]).c2go()
@@ -682,12 +669,8 @@ type BOS_Descriptor struct {
682669
}
683670

684671
func (x *Struct_Libusb_BOS_Descriptor) c2go() *BOS_Descriptor {
685-
var list []*Struct_Libusb_BOS_Dev_Capability_Descriptor
686672
x_c := (*C.struct_libusb_bos_descriptor)(x)
687-
hdr := (*reflect.SliceHeader)(unsafe.Pointer(&list))
688-
hdr.Cap = int(x.bNumDeviceCaps)
689-
hdr.Len = int(x.bNumDeviceCaps)
690-
hdr.Data = uintptr(unsafe.Pointer(C.dev_capability_ptr(x_c)))
673+
list := unsafe.Slice((**Struct_Libusb_BOS_Dev_Capability_Descriptor)(unsafe.Pointer(C.dev_capability_ptr(x_c))), int(x.bNumDeviceCaps))
691674
dev_capability := make([]*BOS_Dev_Capability_Descriptor, x.bNumDeviceCaps)
692675
for i := range dev_capability {
693676
dev_capability[i] = list[i].c2go()
@@ -994,11 +977,7 @@ func Get_Device_List(ctx Context) ([]Device, error) {
994977
return nil, &libusb_error{rc}
995978
}
996979
// turn the c array into a slice of device pointers
997-
var list []Device
998-
hdr := (*reflect.SliceHeader)(unsafe.Pointer(&list))
999-
hdr.Cap = rc
1000-
hdr.Len = rc
1001-
hdr.Data = uintptr(unsafe.Pointer(hdl))
980+
list := unsafe.Slice((*Device)(unsafe.Pointer(hdl)), rc)
1002981
return list, nil
1003982
}
1004983

0 commit comments

Comments
 (0)