lysann/passforios-gopenpgp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use Entitiy.EncryptionKey instead of reimplementing it

Browse source 
This fixes us sometimes using subkeys whose key flags allow
encryption but don't have a valid algorithm for encryption,
or that are expired, etc.
This commit is contained in:
Daniel Huigens 2019-05-23 16:36:24 +02:00
parent e65ed17b41
commit 781681b548
4 changed files with 6 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

19
crypto/session.go
View file

@ -6,7 +6,6 @@ import (
"fmt"
"io"
"golang.org/x/crypto/openpgp"
"golang.org/x/crypto/openpgp/packet"
)
@ -70,22 +69,8 @@ func (keyRing *KeyRing) EncryptSessionKey(sessionSplit *SymmetricKey) ([]byte, e
var pub *packet.PublicKey
for _, e := range keyRing.GetEntities() {
for _, subKey := range e.Subkeys {
if !subKey.Sig.FlagsValid || subKey.Sig.FlagEncryptStorage || subKey.Sig.FlagEncryptCommunications {
pub = subKey.PublicKey
break
}
}
if pub == nil && len(e.Identities) > 0 {
var i *openpgp.Identity
for _, i = range e.Identities {
break
}
if i.SelfSignature.FlagsValid || i.SelfSignature.FlagEncryptStorage || i.SelfSignature.FlagEncryptCommunications {
pub = e.PrimaryKey
}
}
if pub != nil {
if encryptionKey, ok := e.EncryptionKey(pgp.getNow()); ok {
pub = encryptionKey.PublicKey
break
}
}