Update dependencies

This commit is contained in:
Unrud 2025-12-24 22:57:01 +01:00
parent 800171efdd
commit eebde58826
5 changed files with 28 additions and 30 deletions

View file

@ -17,8 +17,8 @@ modules:
path: ..
- type: git
url: https://github.com/godbus/dbus
tag: v5.1.0
commit: e523abc905595cf17fb0001a7d77eaaddfaa216d
tag: v5.2.1
commit: 20d95a3d9a57a5cb72cbdafb3fd9ecb6d2ccd038
dest: vendor/github.com/godbus/dbus/v5
- type: git
url: https://github.com/skip2/go-qrcode
@ -26,14 +26,14 @@ modules:
dest: vendor/github.com/skip2/go-qrcode
- type: git
url: https://github.com/golang/net
tag: v0.46.0
commit: 2002a064a49010d8b881673c73f04e0b741e7c32
tag: v0.48.0
commit: 35e1306bddd863f360fb94480c5fed84229953f0
dest: vendor/golang.org/x/net
- type: git
url: https://github.com/golang/crypto
tag: v0.43.0
commit: 627cb894b6b2021e34c4ad4af4c0a963127491e4
dest: vendor/golang.org/x/crypto
url: https://github.com/golang/sys
tag: v0.39.0
commit: 08e54827f6706016347e1e4f4866b84126842b20
dest: vendor/golang.org/x/sys
- type: file
path: modules.txt
dest: vendor

View file

@ -1,17 +1,17 @@
# github.com/bendahl/uinput v1.7.0
## explicit; go 1.13
github.com/bendahl/uinput
# github.com/godbus/dbus/v5 v5.1.0
## explicit; go 1.12
# github.com/godbus/dbus/v5 v5.2.1
## explicit; go 1.20
github.com/godbus/dbus/v5
# github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e
## explicit; go 1.13
github.com/skip2/go-qrcode
github.com/skip2/go-qrcode/bitset
github.com/skip2/go-qrcode/reedsolomon
# golang.org/x/crypto v0.43.0
## explicit; go 1.24.0
golang.org/x/crypto/hkdf
# golang.org/x/net v0.46.0
# golang.org/x/net v0.48.0
## explicit; go 1.24.0
golang.org/x/net/websocket
# golang.org/x/sys v0.39.0
## explicit; go 1.24.0
golang.org/x/sys/unix

11
go.mod
View file

@ -1,13 +1,12 @@
module github.com/unrud/remote-touchpad
go 1.24.0
toolchain go1.24.8
go 1.25.5
require (
github.com/bendahl/uinput v1.7.0
github.com/godbus/dbus/v5 v5.1.0
github.com/godbus/dbus/v5 v5.2.1
github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e
golang.org/x/crypto v0.43.0
golang.org/x/net v0.46.0
golang.org/x/net v0.48.0
)
require golang.org/x/sys v0.39.0 // indirect

12
go.sum
View file

@ -1,10 +1,10 @@
github.com/bendahl/uinput v1.7.0 h1:nA4fm8Wu8UYNOPykIZm66nkWEyvxzfmJ8YC02PM40jg=
github.com/bendahl/uinput v1.7.0/go.mod h1:Np7w3DINc9wB83p12fTAM3DPPhFnAKP0WTXRqCQJ6Z8=
github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk=
github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
github.com/godbus/dbus/v5 v5.2.1 h1:I4wwMdWSkmI57ewd+elNGwLRf2/dtSaFz1DujfWYvOk=
github.com/godbus/dbus/v5 v5.2.1/go.mod h1:3AAv2+hPq5rdnr5txxxRwiGjPXamgoIHgz9FPBfOp3c=
github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e h1:MRM5ITcdelLK2j1vwZ3Je0FKVCfqOLp5zO6trqMLYs0=
github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e/go.mod h1:XV66xRDqSt+GTGFMVlhk3ULuV0y9ZmzeVGR4mloJI3M=
golang.org/x/crypto v0.43.0 h1:dduJYIi3A3KOfdGOHX8AVZ/jGiyPa3IbBozJ5kNuE04=
golang.org/x/crypto v0.43.0/go.mod h1:BFbav4mRNlXJL4wNeejLpWxB7wMbc79PdRGhWKncxR0=
golang.org/x/net v0.46.0 h1:giFlY12I07fugqwPuWJi68oOnpfqFnJIJzaIIm2JVV4=
golang.org/x/net v0.46.0/go.mod h1:Q9BGdFy1y4nkUwiLvT5qtyhAnEHgnQ/zd8PfU6nc210=
golang.org/x/net v0.48.0 h1:zyQRTTrjc33Lhh0fBgT/H3oZq9WuvRR5gPC70xpDiQU=
golang.org/x/net v0.48.0/go.mod h1:+ndRgGjkh8FGtu1w1FGbEC31if4VrNVMuKTgcAAnQRY=
golang.org/x/sys v0.39.0 h1:CvCKL8MeisomCi6qNZ+wbb0DN9E5AATixKsvNtMoMFk=
golang.org/x/sys v0.39.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=

View file

@ -24,6 +24,7 @@ package inputcontrol
import (
"crypto/aes"
"crypto/cipher"
"crypto/hkdf"
"crypto/rand"
"crypto/sha256"
"errors"
@ -35,7 +36,6 @@ import (
"slices"
"github.com/godbus/dbus/v5"
"golang.org/x/crypto/hkdf"
)
const (
@ -230,9 +230,8 @@ type secretStore struct {
}
func newSecretStore(key []byte, filename string) (*secretStore, error) {
hkdf := hkdf.New(sha256.New, key, nil, nil)
derivedKey := make([]byte, 32)
if _, err := io.ReadFull(hkdf, derivedKey); err != nil {
derivedKey, err := hkdf.Key(sha256.New, key, nil, "", 32)
if err != nil {
return nil, err
}
block, err := aes.NewCipher(derivedKey)