Skip to content

Commit 16a748c

Browse files
committed
Merge commit 'refs/pull/3120/head' of github.com:BitBoxSwiss/bitbox-wallet-app
2 parents b75f28c + 4860a3a commit 16a748c

File tree

5 files changed

+29
-18
lines changed

5 files changed

+29
-18
lines changed

go.mod

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ require (
1919
github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e
2020
github.com/stretchr/testify v1.10.0
2121
go.etcd.io/bbolt v1.3.11
22-
golang.org/x/crypto v0.30.0
22+
golang.org/x/crypto v0.32.0
2323
golang.org/x/mobile v0.0.0-20240716161057-1ad2df20a8b6
24-
golang.org/x/net v0.32.0
24+
golang.org/x/net v0.34.0
2525
)
2626

2727
require (
@@ -56,7 +56,7 @@ require (
5656
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
5757
golang.org/x/mod v0.19.0 // indirect
5858
golang.org/x/sync v0.7.0 // indirect
59-
golang.org/x/sys v0.28.0 // indirect
59+
golang.org/x/sys v0.29.0 // indirect
6060
golang.org/x/tools v0.23.0 // indirect
6161
google.golang.org/protobuf v1.34.2 // indirect
6262
gopkg.in/yaml.v3 v3.0.1 // indirect

go.sum

+6-6
Original file line numberDiff line numberDiff line change
@@ -248,8 +248,8 @@ golang.org/x/crypto v0.0.0-20170930174604-9419663f5a44/go.mod h1:6SG95UA2DQfeDnf
248248
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
249249
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
250250
golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
251-
golang.org/x/crypto v0.30.0 h1:RwoQn3GkWiMkzlX562cLB7OxWvjH1L8xutO2WoJcRoY=
252-
golang.org/x/crypto v0.30.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
251+
golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc=
252+
golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc=
253253
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8=
254254
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY=
255255
golang.org/x/mobile v0.0.0-20240716161057-1ad2df20a8b6 h1:/VlmIrkuLf2wzPjkZ8imSpckHoW7Y71h66dxbLHSpi8=
@@ -262,8 +262,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn
262262
golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
263263
golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
264264
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
265-
golang.org/x/net v0.32.0 h1:ZqPmj8Kzc+Y6e0+skZsuACbx+wzMgo5MQsJh9Qd6aYI=
266-
golang.org/x/net v0.32.0/go.mod h1:CwU0IoeOlnQQWJ6ioyFrfRuomB8GKF6KbYXZVyeXNfs=
265+
golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=
266+
golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=
267267
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
268268
golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
269269
golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
@@ -280,8 +280,8 @@ golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed/go.mod h1:h1NjWce9XRLGQEsW7w
280280
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
281281
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
282282
golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
283-
golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
284-
golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
283+
golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
284+
golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
285285
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
286286
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
287287
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=

vendor/golang.org/x/sys/unix/syscall_dragonfly.go

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

vendor/golang.org/x/sys/windows/dll_windows.go

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

vendor/modules.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ github.com/yusufpapurcu/wmi
250250
# go.etcd.io/bbolt v1.3.11
251251
## explicit; go 1.22
252252
go.etcd.io/bbolt
253-
# golang.org/x/crypto v0.30.0
253+
# golang.org/x/crypto v0.32.0
254254
## explicit; go 1.20
255255
golang.org/x/crypto/blake2b
256256
golang.org/x/crypto/blake2s
@@ -279,14 +279,14 @@ golang.org/x/mobile/internal/mobileinit
279279
# golang.org/x/mod v0.19.0
280280
## explicit; go 1.18
281281
golang.org/x/mod/semver
282-
# golang.org/x/net v0.32.0
282+
# golang.org/x/net v0.34.0
283283
## explicit; go 1.18
284284
golang.org/x/net/internal/socks
285285
golang.org/x/net/proxy
286286
# golang.org/x/sync v0.7.0
287287
## explicit; go 1.18
288288
golang.org/x/sync/errgroup
289-
# golang.org/x/sys v0.28.0
289+
# golang.org/x/sys v0.29.0
290290
## explicit; go 1.18
291291
golang.org/x/sys/cpu
292292
golang.org/x/sys/unix

0 commit comments

Comments
 (0)