mirror of
https://github.com/getsops/sops.git
synced 2026-02-05 12:45:21 +01:00
Sort masterkeys according to decryption-order
Co-authored-by: Gabriel Martinez <19713226+GMartinez-Sisti@users.noreply.github.com> Co-authored-by: Felix Fontein <felix@fontein.de> Co-authored-by: Bastien Wermeille <bastien.wermeille@gmail.com> Co-authored-by: Hidde Beydals <hiddeco@users.noreply.github.com> Signed-off-by: Boris Kreitchman <bkreitch@gmail.com>
This commit is contained in:
committed by
Hidde Beydals
parent
30281796df
commit
c822b55290
@@ -4,7 +4,7 @@ interface that encrypts and decrypts the data key by first trying with the
|
||||
github.com/ProtonMail/go-crypto/openpgp package and if that fails, by calling
|
||||
the "gpg" binary.
|
||||
*/
|
||||
package pgp //import "github.com/getsops/sops/v3/pgp"
|
||||
package pgp // import "github.com/getsops/sops/v3/pgp"
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
@@ -22,12 +22,15 @@ import (
|
||||
"github.com/ProtonMail/go-crypto/openpgp"
|
||||
"github.com/ProtonMail/go-crypto/openpgp/armor"
|
||||
gpgagent "github.com/getsops/gopgagent"
|
||||
"github.com/getsops/sops/v3/logging"
|
||||
"github.com/sirupsen/logrus"
|
||||
"golang.org/x/term"
|
||||
|
||||
"github.com/getsops/sops/v3/logging"
|
||||
)
|
||||
|
||||
const (
|
||||
// KeyTypeIdentifier is the string used to identify a PGP MasterKey.
|
||||
KeyTypeIdentifier = "pgp"
|
||||
// SopsGpgExecEnv can be set as an environment variable to overwrite the
|
||||
// GnuPG binary used.
|
||||
SopsGpgExecEnv = "SOPS_GPG_EXEC"
|
||||
@@ -449,6 +452,11 @@ func (key MasterKey) ToMap() map[string]interface{} {
|
||||
return out
|
||||
}
|
||||
|
||||
// TypeToIdentifier returns the string identifier for the MasterKey type.
|
||||
func (key *MasterKey) TypeToIdentifier() string {
|
||||
return KeyTypeIdentifier
|
||||
}
|
||||
|
||||
// retrievePubKey attempts to retrieve the public key from the public keyring
|
||||
// by Fingerprint.
|
||||
func (key *MasterKey) retrievePubKey() (openpgp.Entity, error) {
|
||||
|
||||
Reference in New Issue
Block a user