IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Chore: Use maintained crypto library (#66304)

Browse Source
This commit is contained in:
Andres Martinez Gotor
2023-04-12 11:18:38 +02:00
committed by GitHub
parent 24d348f804
commit 48de17945f
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/plugins/manager/signature/manifest.go
View File

@@ -16,14 +16,10 @@ import (
"runtime" "runtime"
"strings" "strings"
"github.com/ProtonMail/go-crypto/openpgp"
"github.com/ProtonMail/go-crypto/openpgp/clearsign"
"github.com/ProtonMail/go-crypto/openpgp/packet"
"github.com/gobwas/glob" "github.com/gobwas/glob"
// TODO: replace deprecated `golang.org/x/crypto` package https://github.com/grafana/grafana/issues/46050
// nolint:staticcheck
"golang.org/x/crypto/openpgp"
// nolint:staticcheck
"golang.org/x/crypto/openpgp/clearsign"
"github.com/grafana/grafana/pkg/plugins" "github.com/grafana/grafana/pkg/plugins"
"github.com/grafana/grafana/pkg/plugins/log" "github.com/grafana/grafana/pkg/plugins/log"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"
@@ -337,7 +333,7 @@ func validateManifest(m PluginManifest, block *clearsign.Block) error {
if _, err = openpgp.CheckDetachedSignature(keyring, if _, err = openpgp.CheckDetachedSignature(keyring,
bytes.NewBuffer(block.Bytes), bytes.NewBuffer(block.Bytes),
block.ArmoredSignature.Body); err != nil { block.ArmoredSignature.Body, &packet.Config{}); err != nil {
return fmt.Errorf("%v: %w", "failed to check signature", err) return fmt.Errorf("%v: %w", "failed to check signature", err)
} }